Cleaned up tracing levels. Array sorter now has its own control knob.

[libucw.git] / lib / sorter / config.c

diff --git a/lib/sorter/config.c b/lib/sorter/config.c
index 8708f7e457eb1df0669c6bdba8d411e3bca9032c..5e3da8dd9006155818f6d07e0ecdcd7360d6d838 100644 (file)
--- a/lib/sorter/config.c
+++ b/lib/sorter/config.c
@@ -13,24 +13,40 @@
 #include "lib/sorter/common.h"
 
 uns sorter_trace;
 #include "lib/sorter/common.h"
 
 uns sorter_trace;

-uns sorter_presort_bufsize = 65536;            /* FIXME: kill after removing the old sorter */
-uns sorter_stream_bufsize = 65536;
+uns sorter_trace_array;

 u64 sorter_bufsize = 65536;
 uns sorter_debug;
 uns sorter_min_radix_bits;
 uns sorter_max_radix_bits;
 u64 sorter_bufsize = 65536;
 uns sorter_debug;
 uns sorter_min_radix_bits;
 uns sorter_max_radix_bits;

+uns sorter_add_radix_bits;
+uns sorter_min_multiway_bits;
+uns sorter_max_multiway_bits;
+uns sorter_threads;
+uns sorter_thread_threshold = 1048576;
+uns sorter_thread_chunk = 4096;
+uns sorter_radix_threshold = 4096;

 struct fb_params sorter_fb_params;
 struct fb_params sorter_fb_params;

+struct fb_params sorter_small_fb_params;
+u64 sorter_small_input;

 
 static struct cf_section sorter_config = {
   CF_ITEMS {
     CF_UNS("Trace", &sorter_trace),
 
 static struct cf_section sorter_config = {
   CF_ITEMS {
     CF_UNS("Trace", &sorter_trace),

-    CF_UNS("PresortBuffer", &sorter_presort_bufsize),
-    CF_UNS("StreamBuffer", &sorter_stream_bufsize),
+    CF_UNS("TraceArray", &sorter_trace_array),

     CF_SECTION("FileAccess", &sorter_fb_params, &fbpar_cf),
     CF_SECTION("FileAccess", &sorter_fb_params, &fbpar_cf),

+    CF_SECTION("SmallFileAccess", &sorter_fb_params, &fbpar_cf),
+    CF_U64("SmallInput", &sorter_small_input),

     CF_U64("SortBuffer", &sorter_bufsize),
     CF_UNS("Debug", &sorter_debug),
     CF_UNS("MinRadixBits", &sorter_min_radix_bits),
     CF_UNS("MaxRadixBits", &sorter_max_radix_bits),
     CF_U64("SortBuffer", &sorter_bufsize),
     CF_UNS("Debug", &sorter_debug),
     CF_UNS("MinRadixBits", &sorter_min_radix_bits),
     CF_UNS("MaxRadixBits", &sorter_max_radix_bits),

+    CF_UNS("AddRadixBits", &sorter_add_radix_bits),
+    CF_UNS("MinMultiwayBits", &sorter_min_multiway_bits),
+    CF_UNS("MaxMultiwayBits", &sorter_max_multiway_bits),
+    CF_UNS("Threads", &sorter_threads),
+    CF_UNS("ThreadThreshold", &sorter_thread_threshold),
+    CF_UNS("ThreadChunk", &sorter_thread_chunk),
+    CF_UNS("RadixThreshold", &sorter_radix_threshold),

     CF_END
   }
 };
     CF_END
   }
 };