X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=lib%2Fsorter%2Fcommon.h;h=92423046d4f62bf7dbfc0ef61c17b1e6220ec97d;hb=a5ff98a53789157a6c96e58b2385bb898d688a22;hp=cae6cf92c3bc64f2c61026faf72116961bad0ce1;hpb=d02d92d8402023e96465e7f8edbabd70fe96df06;p=libucw.git

diff --git a/lib/sorter/common.h b/lib/sorter/common.h
index cae6cf92..92423046 100644
--- 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_presort_bufsize, sorter_stream_bufsize;
-extern uns sorter_debug, sorter_min_radix_bits, sorter_max_radix_bits;
+extern uns sorter_trace, 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;
@@ -124,7 +126,7 @@ struct asort_context {
   void *buffer;				// Auxiliary buffer (required when radix-sorting)
   uns num_elts;				// Number of elements in the array
   uns elt_size;				// Bytes per element
-  uns hash_bits;			// Remaining bits of hash function
+  uns hash_bits;			// Remaining bits of the hash function
   uns radix_bits;			// How many bits to process in a single radix-sort pass
   void (*quicksort)(void *array_ptr, uns num_elts);
   void (*quicksplit)(void *array_ptr, uns num_elts, int *leftp, int *rightp);
@@ -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;
 };