X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=inline;f=lib%2Fsorter%2Fcommon.h;h=b4b24ab865af01890d71552d368f702a47750389;hb=240457dec3ea3ef6d758e86e6bbf68c530f3c056;hp=198626899c993ee34c006b55a6298a0a01a75be0;hpb=5d1afde9279882d7609b5c97a0628ab8bf9d4265;p=libucw.git

diff --git a/lib/sorter/common.h b/lib/sorter/common.h
index 19862689..b4b24ab8 100644
--- a/lib/sorter/common.h
+++ b/lib/sorter/common.h
@@ -16,15 +16,17 @@
 extern uns sorter_trace, sorter_presort_bufsize, sorter_stream_bufsize;
 extern uns sorter_debug, sorter_min_radix_bits, sorter_max_radix_bits;
 extern u64 sorter_bufsize;
+extern struct fb_params sorter_fb_params;
 
-#define SORT_TRACE(x...) do { if (sorter_trace) log(L_DEBUG, x); } while(0)
-#define SORT_XTRACE(level, x...) do { if (sorter_trace >= level) log(L_DEBUG, x); } while(0)
+#define SORT_TRACE(x...) do { if (sorter_trace) msg(L_DEBUG, x); } while(0)
+#define SORT_XTRACE(level, x...) do { if (sorter_trace >= level) msg(L_DEBUG, x); } while(0)
 
 enum sort_debug {
   SORT_DEBUG_NO_PRESORT = 1,
   SORT_DEBUG_NO_JOIN = 2,
   SORT_DEBUG_KEEP_BUCKETS = 4,
   SORT_DEBUG_NO_RADIX = 8,
+  SORT_DEBUG_NO_MULTIWAY = 16,
 };
 
 struct sort_bucket;
@@ -37,8 +39,8 @@ struct sort_context {
 
   struct mempool *pool;
   clist bucket_list;
-  void *big_buf, *big_buf_half;
-  size_t big_buf_size, big_buf_half_size;
+  void *big_buf;
+  size_t big_buf_size;
 
   int (*custom_presort)(struct fastbuf *dest, void *buf, size_t bufsize);
 
@@ -53,6 +55,9 @@ struct sort_context {
   // Bucket arrays are NULL-terminated.
   void (*twoway_merge)(struct sort_context *ctx, struct sort_bucket **ins, struct sort_bucket **outs);
 
+  // Multi-way merge: merge an arbitrary number of source buckets to a single destination bucket.
+  void (*multiway_merge)(struct sort_context *ctx, struct sort_bucket **ins, struct sort_bucket *out);
+
   // Radix split according to hash function
   void (*radix_split)(struct sort_context *ctx, struct sort_bucket *in, struct sort_bucket **outs, uns bitpos, uns numbits);
 
@@ -62,6 +67,7 @@ struct sort_context {
 
   // Timing
   timestamp_t start_time;
+  uns last_pass_time;
   uns total_int_time, total_pre_time, total_ext_time;
 };
 
@@ -106,6 +112,5 @@ sh_off_t sbuck_size(struct sort_bucket *b);
 struct fastbuf *sbuck_read(struct sort_bucket *b);
 struct fastbuf *sbuck_write(struct sort_bucket *b);
 void sbuck_swap_out(struct sort_bucket *b);
-void format_size(byte *buf, u64 x);
 
 #endif