X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=lib%2Fsorter%2Fsorter.h;h=d9ae7a00db4572bbd09d92810e53d7c6458b1856;hb=557dc31fa097cfe3b8fdbc087e27da6db7317819;hp=56ccec55df53104f0e1d600815eb574492779f9f;hpb=355926694dd41b2d7e2ce615aad1277ff7953a02;p=libucw.git

diff --git a/lib/sorter/sorter.h b/lib/sorter/sorter.h
index 56ccec55..d9ae7a00 100644
--- a/lib/sorter/sorter.h
+++ b/lib/sorter/sorter.h
@@ -68,7 +68,8 @@
  *  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.
@@ -85,11 +86,6 @@
  *
  *  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:
@@ -168,7 +164,7 @@ static inline int P(hash) (P(key) *x)
 
 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
@@ -200,11 +196,17 @@ static struct fastbuf *P(sort)(
 
 #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