Added a trivial implementation of radix sorting.

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

diff --git a/lib/sorter/common.h b/lib/sorter/common.h
index 99bc6a5f7e68497bfac047bdfddc010ecbcab6ef..52949657ad411c2face099d6d3b4fd0b4ea85d36 100644 (file)
--- a/lib/sorter/common.h
+++ b/lib/sorter/common.h
@@ -18,12 +18,13 @@ extern uns sorter_debug;
 extern u64 sorter_bufsize;
 
 #define SORT_TRACE(x...) do { if (sorter_trace) log(L_DEBUG, x); } while(0)
 extern u64 sorter_bufsize;
 
 #define SORT_TRACE(x...) do { if (sorter_trace) log(L_DEBUG, x); } while(0)

-#define SORT_XTRACE(x...) do { if (sorter_trace > 1) log(L_DEBUG, x); } while(0)
+#define SORT_XTRACE(level, x...) do { if (sorter_trace >= level) log(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,

 };
 
 struct sort_bucket;
 };
 
 struct sort_bucket;


@@ -32,6 +33,7 @@ struct sort_context {
   struct fastbuf *in_fb;
   struct fastbuf *out_fb;
   uns hash_bits;
   struct fastbuf *in_fb;
   struct fastbuf *out_fb;
   uns hash_bits;

+  u64 in_size;

 
   struct mempool *pool;
   clist bucket_list;
 
   struct mempool *pool;
   clist bucket_list;


@@ -45,10 +47,15 @@ struct sort_context {
   // 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);

+  // 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;
 
   // State variables of internal_sort
   void *key_buf;
   int more_keys;

+
+  // Timing
+  u64 start_time;

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


@@ -92,4 +99,8 @@ 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