Made radix-sorting threshold configurable and let radix-tune-bits

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

diff --git a/lib/sorter/common.h b/lib/sorter/common.h
index cae6cf92c3bc64f2c61026faf72116961bad0ce1..f67f9bf9a1522c26fd9ff84db872d83ac61ade27 100644 (file)
--- a/lib/sorter/common.h
+++ b/lib/sorter/common.h
@@ -13,10 +13,10 @@
 #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_trace, sorter_stream_bufsize;
 extern uns sorter_debug, sorter_min_radix_bits, sorter_max_radix_bits;
 extern uns sorter_min_multiway_bits, sorter_max_multiway_bits;
-extern uns sorter_threads, sorter_thread_threshold;
+extern uns sorter_threads, sorter_thread_threshold, sorter_radix_threshold;
 extern u64 sorter_bufsize;
 extern struct fb_params sorter_fb_params;
 
@@ -124,7 +124,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);