#ifdef SORT_INT64
typedef u64 P(hash_t);
#define SORT_INT SORT_INT64
+#define SORT_LONG_HASH
#else
typedef uns P(hash_t);
#endif
}
#endif
+#if defined(SORT_HASH_BITS) || defined(SORT_INT)
+#define SORT_INTERNAL_RADIX
+#include "lib/sorter/s-radix.h"
+#endif
+
#if defined(SORT_VAR_KEY) || defined(SORT_VAR_DATA) || defined(SORT_UNIFY_WORKSPACE)
#include "lib/sorter/s-internal.h"
#else
#endif
#include "lib/sorter/s-twoway.h"
-
-#if defined(SORT_HASH_BITS) || defined(SORT_INT)
-#include "lib/sorter/s-radix.h"
-#endif
+#include "lib/sorter/s-multiway.h"
static struct fastbuf *P(sort)(
#ifdef SORT_INPUT_FILE
ctx.internal_sort = P(internal);
ctx.internal_estimate = P(internal_estimate);
ctx.twoway_merge = P(twoway_merge);
+ ctx.multiway_merge = P(multiway_merge);
sorter_run(&ctx);
#ifdef SORT_OUTPUT_FILE
- if (rename(ctx.out_fb->name, out) < 0)
- die("Cannot rename %s to %s: %m", ctx.out_fb->name, out);
- bconfig(ctx.out_fb, BCONFIG_IS_TEMP_FILE, 0);
- bclose(ctx.out_fb);
+ bfix_tmp_file(ctx.out_fb, out);
ctx.out_fb = NULL;
#endif
return ctx.out_fb;
#undef SORT_UNIQUE
#undef SORT_ASSERT_UNIQUE
#undef SORT_DELETE_INPUT
+#undef SORT_INTERNAL_RADIX
+#undef SORT_LONG_HASH
#undef SWAP
#undef LESS
#undef P