X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=lib%2Fsorter%2Fsorter.h;h=c2905345e910feaa6d26da100c7894d43b21bc7e;hb=b340e1fbbfa9fcfc4c3f9ef41c84f2e86c523bdc;hp=89cf9f0df7f4e5b5160658d5a0b99f8747943ff7;hpb=ae3892dc4f3c3a759315969e2ab5156f034707b2;p=libucw.git

diff --git a/lib/sorter/sorter.h b/lib/sorter/sorter.h
index 89cf9f0d..c2905345 100644
--- a/lib/sorter/sorter.h
+++ b/lib/sorter/sorter.h
@@ -60,10 +60,13 @@
  *  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.
  *  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.
+ *  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):
  *
@@ -75,6 +78,8 @@
  *			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):
  *
@@ -88,7 +93,7 @@
  *
  *  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
@@ -172,7 +177,7 @@ static inline void P(copy_data)(P(key) *key, struct fastbuf *in, struct fastbuf
 #endif
 }
 
-#if defined(SORT_VAR_KEY) || defined(SORT_VAR_DATA) || defined(SORT_UNIFY)
+#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"
@@ -219,6 +224,10 @@ static struct fastbuf *P(sort)(
 #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);
@@ -266,6 +275,7 @@ static struct fastbuf *P(sort)(
 #undef SORT_INT
 #undef SORT_HASH_BITS
 #undef SORT_UNIFY
+#undef SORT_UNIFY_WORKSPACE
 #undef SORT_INPUT_FILE
 #undef SORT_INPUT_FB
 #undef SORT_INPUT_PRESORT
@@ -274,6 +284,7 @@ static struct fastbuf *P(sort)(
 #undef SORT_OUTPUT_THIS_FB
 #undef SORT_UNIQUE
 #undef SORT_ASSERT_UNIQUE
+#undef SORT_DELETE_INPUT
 #undef SWAP
 #undef LESS
 #undef P