X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=lib%2Fsorter%2Fconfig.c;h=75d8fa49030876a8b4f3add48906c1a57b11426b;hb=7cf300f543b5023ad46a909ed6fde0feba5d1acd;hp=8708f7e457eb1df0669c6bdba8d411e3bca9032c;hpb=14e105850c5d3451a44fc50f2814683c0df3ae1b;p=libucw.git

diff --git a/lib/sorter/config.c b/lib/sorter/config.c
index 8708f7e4..75d8fa49 100644
--- a/lib/sorter/config.c
+++ b/lib/sorter/config.c
@@ -13,24 +13,32 @@
 #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;
 u64 sorter_bufsize = 65536;
 uns sorter_debug;
 uns sorter_min_radix_bits;
 uns sorter_max_radix_bits;
+uns sorter_min_multiway_bits;
+uns sorter_max_multiway_bits;
+uns sorter_threads;
+uns sorter_thread_threshold;
+uns sorter_radix_threshold = 4096;
 struct fb_params sorter_fb_params;
 
 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_SECTION("FileAccess", &sorter_fb_params, &fbpar_cf),
     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("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("RadixThreshold", &sorter_radix_threshold),
     CF_END
   }
 };