* corresponding preprocessor macros, it generates a file sorter
* with the parameters given.
*
- * FIXME: explain the basics (keys and data, callbacks etc.)
+ * The sorter operates on fastbufs containing sequences of items. Each items
+ * consists of a key, optionally followed by data. The keys are represented
+ * by fixed-size structures of type SORT_KEY internally, if this format differs
+ * from the on-disk format, explicit reading and writing routines can be provided.
+ * The data are always copied verbatim, unless the sorter is in the merging
+ * mode in which it calls callbacks for merging of items with equal keys.
+ *
+ * All callbacks must be thread-safe.
*
* Basic parameters and callbacks:
*
- * SORT_PREFIX(x) add a name prefix (used on all global names
- * defined by the sorter)
+ * SORT_PREFIX(x) add a name prefix (used on all global names defined by the sorter)
*
- * SORT_KEY data type capable of storing a single key.
+ * SORT_KEY data type capable of holding a single key in memory (the on-disk
+ * representation can be different). Alternatively, you can use:
* SORT_KEY_REGULAR data type holding a single key both in memory and on disk;
* in this case, bread() and bwrite() is used to read/write keys
* and it's also assumed that the keys are not very long.
* int PREFIX_compare(SORT_KEY *a, SORT_KEY *b)
- * compares two keys, result like strcmp(). Mandatory.
+ * compares two keys, returns result like strcmp(). Mandatory.
* int PREFIX_read_key(struct fastbuf *f, SORT_KEY *k)
* reads a key from a fastbuf, returns nonzero=ok, 0=EOF.
* Mandatory unless SORT_KEY_REGULAR is defined.
*
* Integer sorting:
*
- * SORT_INT(key) We are sorting by an integer value. In this mode, PREFIX_compare
- * is supplied automatically and the sorting function gets an extra
- * parameter specifying a range of the integers. The better the range
- * fits, the faster we sort. Sets up SORT_HASH_xxx automatically.
+ * SORT_INT(key) we are sorting by an integer value returned by this macro.
+ * In this mode, PREFIX_compare is supplied automatically and the sorting
+ * function gets an extra parameter specifying the range of the integers.
+ * The better the range fits, the faster we sort.
+ * Sets up SORT_HASH_xxx automatically.
+ * SORT_INT64(key) the same for 64-bit integers.
*
* Hashing (optional, but it can speed sorting up):
*
* 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.
+ * bits is available. A monotone hash is a function f from keys to integers
+ * such that f(x) < f(y) implies x < y, which is approximately uniformly
+ * distributed. It should be declared as:
* uns PREFIX_hash(SORT_KEY *a)
*
* Unification:
*
- * SORT_UNIFY merge items with identical keys, needs the following functions:
+ * SORT_UNIFY merge items with identical keys. It requires the following functions:
* void PREFIX_write_merged(struct fastbuf *f, SORT_KEY **keys, void **data, uns n, void *buf)
* takes n records in memory with keys which compare equal and writes
* a single record to the given fastbuf. `buf' points to a buffer which
- * is guaranteed to hold all given records.
+ * is guaranteed to hold the sum of workspace requirements (see below)
+ * over all given records. The function is allowed to modify all its inputs.
* void PREFIX_copy_merged(SORT_KEY **keys, struct fastbuf **data, uns n, struct fastbuf *dest)
* takes n records with keys in memory and data in fastbufs and writes
- * a single record.
+ * a single record. Used only if SORT_DATA_SIZE or SORT_UNIFY_WORKSPACE
+ * is defined.
+ * SORT_UNIFY_WORKSPACE(key)
+ * gets a key and returns the amount of workspace required when merging
+ * the given record. Defaults to 0.
*
* Input (choose one of these):
*
* 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);
+ * int PREFIX_presort(struct fastbuf *dest, void *buf, size_t bufsize)
* to get successive batches of pre-sorted data.
* The function is passed a page-aligned presorting buffer.
* It returns 1 on success or 0 on EOF.
+ * SORT_DELETE_INPUT A C expression, if true, then the input files are deleted
+ * as soon as possible.
*
* Output (chose one of these):
*
* SORT_OUTPUT_FILE file of a given name
* SORT_OUTPUT_FB temporary fastbuf stream
- * SORT_OUTPUT_THIS_FB a given fastbuf stream which can already contain a header
+ * SORT_OUTPUT_THIS_FB a given fastbuf stream which can already contain some data
*
* Other switches:
*
*
* The function generated:
*
- * <outfb> PREFIX_SORT(<in>, <out> [,<range>]), where:
+ * <outfb> PREFIX_sort(<in>, <out> [,<range>]), where:
* <in> = input file name/fastbuf or NULL
* <out> = output file name/fastbuf or NULL
* <range> = maximum integer value for the SORT_INT mode
- * <outfb> = output fastbuf (in SORT_OUTPUT_FB mode)
*
* After including this file, all parameter macros are automatically
* undef'd.
#error Missing definition of sorting key.
#endif
+#ifdef SORT_INT64
+typedef u64 P(hash_t);
+#define SORT_INT SORT_INT64
+#define SORT_LONG_HASH
+#else
+typedef uns P(hash_t);
+#endif
+
#ifdef SORT_INT
static inline int P(compare) (P(key) *x, P(key) *y)
{
}
#ifndef SORT_HASH_BITS
-static inline int P(hash) (P(key) *x)
+static inline P(hash_t) P(hash) (P(key) *x)
{
return SORT_INT((*x));
}
#endif
}
-#if defined(SORT_VAR_KEY) || defined(SORT_VAR_DATA) || defined(SORT_UNIFY)
+#if defined(SORT_UNIFY) && !defined(SORT_VAR_DATA) && !defined(SORT_UNIFY_WORKSPACE)
+static inline void P(copy_merged)(P(key) **keys, struct fastbuf **data UNUSED, uns n, struct fastbuf *dest)
+{
+ P(write_merged)(dest, keys, NULL, n, NULL);
+}
+#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
#include "lib/sorter/s-fixint.h"
#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
struct fastbuf *out
#endif
#ifdef SORT_INT
- , uns int_range
+ , u64 int_range
#endif
)
{
bzero(&ctx, sizeof(ctx));
#ifdef SORT_INPUT_FILE
- ctx.in_fb = bopen(in, O_RDONLY, sorter_stream_bufsize);
+ ctx.in_fb = bopen_file(in, O_RDONLY, &sorter_fb_params);
ctx.in_size = bfilesize(ctx.in_fb);
#elif defined(SORT_INPUT_FB)
ctx.in_fb = in;
#else
#error No input given.
#endif
+#ifdef SORT_DELETE_INPUT
+ if (SORT_DELETE_INPUT)
+ bconfig(ctx.in_fb, BCONFIG_IS_TEMP_FILE, 1);
+#endif
#ifdef SORT_OUTPUT_FB
ASSERT(!out);
ctx.radix_split = P(radix_split);
#elif defined(SORT_INT)
ctx.hash_bits = 0;
- while (ctx.hash_bits < 32 && (int_range >> ctx.hash_bits))
+ while (ctx.hash_bits < 64 && (int_range >> ctx.hash_bits))
ctx.hash_bits++;
ctx.radix_split = P(radix_split);
#endif
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_PREFIX
-#undef SORT_KEY
-#undef SORT_KEY_REGULAR
-#undef SORT_KEY_SIZE
+#undef SORT_ASSERT_UNIQUE
#undef SORT_DATA_SIZE
-#undef SORT_VAR_KEY
-#undef SORT_VAR_DATA
-#undef SORT_INT
+#undef SORT_DELETE_INPUT
#undef SORT_HASH_BITS
-#undef SORT_UNIFY
-#undef SORT_INPUT_FILE
#undef SORT_INPUT_FB
+#undef SORT_INPUT_FILE
+#undef SORT_INPUT_PIPE
#undef SORT_INPUT_PRESORT
-#undef SORT_OUTPUT_FILE
+#undef SORT_INT
+#undef SORT_INT64
+#undef SORT_INTERNAL_RADIX
+#undef SORT_KEY
+#undef SORT_KEY_REGULAR
+#undef SORT_KEY_SIZE
+#undef SORT_LONG_HASH
#undef SORT_OUTPUT_FB
+#undef SORT_OUTPUT_FILE
#undef SORT_OUTPUT_THIS_FB
+#undef SORT_PREFIX
+#undef SORT_UNIFY
+#undef SORT_UNIFY_WORKSPACE
#undef SORT_UNIQUE
-#undef SORT_ASSERT_UNIQUE
+#undef SORT_VAR_DATA
+#undef SORT_VAR_KEY
#undef SWAP
#undef LESS
#undef P
-/* FIXME: Check that we undef everything we should. */
projects / libucw.git / blobdiff