X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=lib%2Fsorter%2Fconfig.c;h=178b190437fd05360c0f9c5b26840907d2c0168f;hb=89e1c88c0d904e474f134cde37b78c8dedd4b9d1;hp=1587207628212859bd330376580a8b75dda759de;hpb=116954d49373438c669eadd764e03ee8ac4211bb;p=libucw.git

diff --git a/lib/sorter/config.c b/lib/sorter/config.c
index 15872076..178b1904 100644
--- a/lib/sorter/config.c
+++ b/lib/sorter/config.c
@@ -1,5 +1,5 @@
 /*
- *	UCW Library -- Universal Sorter -- Configuration
+ *	UCW Library -- Universal Sorter: Configuration
  *
  *	(c) 2007 Martin Mares <mj@ucw.cz>
  *
@@ -13,14 +13,30 @@
 #include "lib/sorter/common.h"
 
 uns sorter_trace;
-uns sorter_presort_bufsize = 65536;
 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;
+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_END
   }
 };