X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=lib%2Fsorter%2Fsorter.h;h=56ccec55df53104f0e1d600815eb574492779f9f;hb=396f0bc99fd49bfdac3bcc6681342fe76d4f79df;hp=fe6cefc11f28b67df6c4d92e9f95704441fccce6;hpb=5ff0a5b047624c8f215da9cd6c7182d609fcbd01;p=libucw.git

diff --git a/lib/sorter/sorter.h b/lib/sorter/sorter.h
index fe6cefc1..56ccec55 100644
--- a/lib/sorter/sorter.h
+++ b/lib/sorter/sorter.h
@@ -56,12 +56,11 @@
  *
  *  Unification:
  *
- *  SORT_MERGE		merge items with identical keys, needs the following functions:
- *  void PREFIX_write_merged(struct fastbuf *f, SORT_KEY **keys, uns n, byte *buf)
+ *  SORT_UNIFY		merge items with identical keys, needs 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. Data for each key can
- *			be accessed by the SORT_GET_DATA(*key) macro. `buf' points
- *			to a buffer which is guaranteed to hold all given records.
+ *			a single record to the given fastbuf. `buf' points to a buffer which
+ *			is guaranteed to hold all given records.
  *  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.
@@ -70,10 +69,11 @@
  *
  *  SORT_INPUT_FILE	file of a given name
  *  SORT_INPUT_FB	fastbuf stream
- *  SORT_INPUT_PRESORT	custom presorter: call function PREFIX_presorter (see below)
- *			to get successive batches of pre-sorted data as temporary
- *			fastbuf streams or NULL if no more data is available.
+ *  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.
  *			The function is passed a page-aligned presorting buffer.
+ *			It returns 1 on success or 0 on EOF.
  *
  *  Output (chose one of these):
  *
@@ -143,7 +143,7 @@ static inline int P(hash) (P(key) *x)
 #endif
 #endif
 
-#ifdef SORT_MERGE
+#ifdef SORT_UNIFY
 #define LESS <
 #else
 #define LESS <=
@@ -154,10 +154,22 @@ static inline int P(hash) (P(key) *x)
 #define SORT_ASSERT_UNIQUE
 #endif
 
+#ifdef SORT_KEY_SIZE
+#define SORT_VAR_KEY
+#else
+#define SORT_KEY_SIZE(key) sizeof(key)
+#endif
+
+#ifdef SORT_DATA_SIZE
+#define SORT_VAR_DATA
+#else
+#define SORT_DATA_SIZE(key) 0
+#endif
+
 static inline void P(copy_data)(P(key) *key, struct fastbuf *in, struct fastbuf *out)
 {
   bwrite(out, key, sizeof(P(key)));
-#ifdef SORT_DATA_SIZE
+#ifdef SORT_VAR_DATA
   bbcopy(in, out, SORT_DATA_SIZE(*key));
 #else
   (void) in;
@@ -192,7 +204,7 @@ static struct fastbuf *P(sort)(
   ctx.in_fb = in;
 #elif defined(SORT_INPUT_PRESORT)
   ASSERT(!in);
-  ctx.custom_presort = P(presorter);
+  ctx.custom_presort = P(presort);
 #else
 #error No input given.
 #endif
@@ -230,13 +242,16 @@ static struct fastbuf *P(sort)(
   return ctx.out_fb;
 }
 
+#undef SORT_PREFIX
 #undef SORT_KEY
 #undef SORT_KEY_REGULAR
 #undef SORT_KEY_SIZE
 #undef SORT_DATA_SIZE
+#undef SORT_VAR_KEY
+#undef SORT_VAR_DATA
 #undef SORT_INT
 #undef SORT_HASH_BITS
-#undef SORT_MERGE
+#undef SORT_UNIFY
 #undef SORT_INPUT_FILE
 #undef SORT_INPUT_FB
 #undef SORT_INPUT_PRESORT