format_size() no longer exists.

[libucw.git] / lib / sorter / common.h

diff --git a/lib/sorter/common.h b/lib/sorter/common.h
index bd5ed9653f26b4d9f73e8bdfbf872cad831dc049..b4b24ab865af01890d71552d368f702a47750389 100644 (file)
--- a/lib/sorter/common.h
+++ b/lib/sorter/common.h
@@ -14,16 +14,19 @@
 
 /* Configuration, some of the variables are used by the old sorter, too. */
 extern uns sorter_trace, sorter_presort_bufsize, sorter_stream_bufsize;
 
 /* Configuration, some of the variables are used by the old sorter, too. */
 extern uns sorter_trace, sorter_presort_bufsize, sorter_stream_bufsize;

-extern uns sorter_debug;
+extern uns sorter_debug, sorter_min_radix_bits, sorter_max_radix_bits;

 extern u64 sorter_bufsize;
 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,
 
 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;
 };
 
 struct sort_bucket;


@@ -36,23 +39,36 @@ struct sort_context {
 
   struct mempool *pool;
   clist bucket_list;
 
   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);
 
   int (*custom_presort)(struct fastbuf *dest, void *buf, size_t bufsize);

+

   // Take as much as possible from the source bucket, sort it in memory and dump to destination bucket.
   // Return 1 if there is more data available in the source bucket.
   int (*internal_sort)(struct sort_context *ctx, struct sort_bucket *in, struct sort_bucket *out, struct sort_bucket *out_only);
   // Take as much as possible from the source bucket, sort it in memory and dump to destination bucket.
   // Return 1 if there is more data available in the source bucket.
   int (*internal_sort)(struct sort_context *ctx, struct sort_bucket *in, struct sort_bucket *out, struct sort_bucket *out_only);

+
+  // Estimate how much input data from `b' will fit in the internal sorting buffer.
+  u64 (*internal_estimate)(struct sort_context *ctx, struct sort_bucket *b);
+

   // Two-way split/merge: merge up to 2 source buckets to up to 2 destination buckets.
   // Bucket arrays are NULL-terminated.
   void (*twoway_merge)(struct sort_context *ctx, struct sort_bucket **ins, struct sort_bucket **outs);
 
   // Two-way split/merge: merge up to 2 source buckets to up to 2 destination buckets.
   // 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);
+

   // State variables of internal_sort
   void *key_buf;
   int more_keys;
 
   // Timing
   // State variables of internal_sort
   void *key_buf;
   int more_keys;
 
   // Timing

-  u64 start_time;
+  timestamp_t start_time;
+  uns last_pass_time;
+  uns total_int_time, total_pre_time, total_ext_time;

 };
 
 void sorter_run(struct sort_context *ctx);
 };
 
 void sorter_run(struct sort_context *ctx);


@@ -60,6 +76,7 @@ void sorter_run(struct sort_context *ctx);
 /* Buffers */
 
 void *sorter_alloc(struct sort_context *ctx, uns size);
 /* Buffers */
 
 void *sorter_alloc(struct sort_context *ctx, uns size);

+void sorter_prepare_buf(struct sort_context *ctx);

 void sorter_alloc_buf(struct sort_context *ctx);
 void sorter_free_buf(struct sort_context *ctx);
 
 void sorter_alloc_buf(struct sort_context *ctx);
 void sorter_free_buf(struct sort_context *ctx);
 


@@ -96,8 +113,4 @@ struct fastbuf *sbuck_read(struct sort_bucket *b);
 struct fastbuf *sbuck_write(struct sort_bucket *b);
 void sbuck_swap_out(struct sort_bucket *b);
 
 struct fastbuf *sbuck_write(struct sort_bucket *b);
 void sbuck_swap_out(struct sort_bucket *b);
 

-#define F_SIZE(x) ({ byte buf[16]; format_size(buf, x); buf; })
-#define F_BSIZE(b) F_SIZE(sbuck_size(b))
-void format_size(byte *buf, u64 x);
-

 #endif
 #endif