* SORT_HASH_BITS signals that a monotone hashing function returning a given number of
* bits is available. Monotone hash is a function f such that f(x) < f(y)
* implies x < y and which is approximately uniformly distributed.
- * uns PREFIX_hash(SORT_KEY *a, SORT_KEY *b)
+ * uns PREFIX_hash(SORT_KEY *a)
*
* Unification:
*
* Input (choose one of these):
*
* SORT_INPUT_FILE file of a given name
- * SORT_INPUT_FB fastbuf stream
+ * SORT_INPUT_FB seekable fastbuf stream
+ * SORT_INPUT_PIPE non-seekable fastbuf stream
* SORT_INPUT_PRESORT custom presorter. Calls function
* int PREFIX_presort(struct fastbuf *dest, void *buf, size_t bufsize);
* to get successive batches of pre-sorted data.
*
* SORT_UNIQUE all items have distinct keys (checked in debug mode)
*
- * FIXME: Maybe implement these:
- * ??? SORT_DELETE_INPUT a C expression, if true, the input files are
- * deleted as soon as possible
- * ??? SORT_ALIGNED
- *
* The function generated:
*
* <outfb> PREFIX_SORT(<in>, <out> [,<range>]), where:
static inline void P(copy_data)(P(key) *key, struct fastbuf *in, struct fastbuf *out)
{
- bwrite(out, key, sizeof(P(key)));
+ P(write_key)(out, key);
#ifdef SORT_VAR_DATA
bbcopy(in, out, SORT_DATA_SIZE(*key));
#else
#include "lib/sorter/s-internal.h"
#include "lib/sorter/s-twoway.h"
+#if defined(SORT_HASH_BITS) || defined(SORT_INT)
+#include "lib/sorter/s-radix.h"
+#endif
+
static struct fastbuf *P(sort)(
#ifdef SORT_INPUT_FILE
byte *in,
#ifdef SORT_INPUT_FILE
ctx.in_fb = bopen(in, O_RDONLY, sorter_stream_bufsize);
+ ctx.in_size = bfilesize(ctx.in_fb);
#elif defined(SORT_INPUT_FB)
ctx.in_fb = in;
+ ctx.in_size = bfilesize(in);
+#elif defined(SORT_INPUT_PIPE)
+ ctx.in_fb = in;
+ ctx.in_size = ~(u64)0;
#elif defined(SORT_INPUT_PRESORT)
ASSERT(!in);
ctx.custom_presort = P(presort);
+ ctx.in_size = ~(u64)0;
#else
#error No input given.
#endif
#ifdef SORT_HASH_BITS
ctx.hash_bits = SORT_HASH_BITS;
+ ctx.radix_split = P(radix_split);
#elif defined(SORT_INT)
ctx.hash_bits = 0;
while (ctx.hash_bits < 32 && (int_range >> ctx.hash_bits))
ctx.hash_bits++;
+ ctx.radix_split = P(radix_split);
#endif
ctx.internal_sort = P(internal);