Merge with git+ssh://git.ucw.cz/projects/sherlock/GIT/sherlock.git#dev-sorter

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

diff --git a/lib/sorter/common.h b/lib/sorter/common.h
index deee9e0449578a6189ba61fc7d4ffab99a530934..1b405a081af0320447b42fca03dfb48800695ab4 100644 (file)
--- a/lib/sorter/common.h
+++ b/lib/sorter/common.h
@@ -13,12 +13,13 @@
 #include "lib/clists.h"
 
 /* Configuration, some of the variables are used by the old sorter, too. */
-extern uns sorter_trace, sorter_stream_bufsize;
-extern uns sorter_debug, sorter_min_radix_bits, sorter_max_radix_bits;
+extern uns sorter_trace, sorter_trace_array, sorter_stream_bufsize;
+extern uns sorter_debug, sorter_min_radix_bits, sorter_max_radix_bits, sorter_add_radix_bits;
 extern uns sorter_min_multiway_bits, sorter_max_multiway_bits;
-extern uns sorter_threads, sorter_thread_threshold;
-extern u64 sorter_bufsize;
-extern struct fb_params sorter_fb_params;
+extern uns sorter_threads, sorter_thread_threshold, sorter_thread_chunk;
+extern uns sorter_radix_threshold;
+extern u64 sorter_bufsize, sorter_small_input;
+extern struct fb_params sorter_fb_params, sorter_small_fb_params;
 
 #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)
@@ -40,6 +41,7 @@ struct sort_context {
   struct fastbuf *out_fb;
   uns hash_bits;
   u64 in_size;
+  struct fb_params *fb_params;
 
   struct mempool *pool;
   clist bucket_list;
@@ -134,7 +136,6 @@ struct asort_context {
   // Used internally by array.c
   struct rs_work **rs_works;
   struct work_queue *rs_work_queue;
-  clist rs_bits;
   struct eltpool *eltpool;
 };