XML: Small bugfix in xml_merge_chars.

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

diff --git a/lib/sorter/config.c b/lib/sorter/config.c
index e0927ba876edcb70462fe7a028a2cc1557d9af29..9ff646b2c45f1bd87c97af71804e6b8685ce4668 100644 (file)
--- a/lib/sorter/config.c
+++ b/lib/sorter/config.c
@@ -13,6 +13,7 @@
 #include "lib/sorter/common.h"
 
 uns sorter_trace;
 #include "lib/sorter/common.h"
 
 uns sorter_trace;

+uns sorter_trace_array;

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


@@ -21,9 +22,9 @@ uns sorter_add_radix_bits;
 uns sorter_min_multiway_bits;
 uns sorter_max_multiway_bits;
 uns sorter_threads;
 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;
+u64 sorter_thread_threshold = 1048576;
+u64 sorter_thread_chunk = 4096;
+u64 sorter_radix_threshold = 4096;

 struct fb_params sorter_fb_params;
 struct fb_params sorter_small_fb_params;
 u64 sorter_small_input;
 struct fb_params sorter_fb_params;
 struct fb_params sorter_small_fb_params;
 u64 sorter_small_input;


@@ -31,6 +32,7 @@ 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("TraceArray", &sorter_trace_array),

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


@@ -42,9 +44,9 @@ static struct cf_section sorter_config = {
     CF_UNS("MinMultiwayBits", &sorter_min_multiway_bits),
     CF_UNS("MaxMultiwayBits", &sorter_max_multiway_bits),
     CF_UNS("Threads", &sorter_threads),
     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_U64("ThreadThreshold", &sorter_thread_threshold),
+    CF_U64("ThreadChunk", &sorter_thread_chunk),
+    CF_U64("RadixThreshold", &sorter_radix_threshold),

     CF_END
   }
 };
     CF_END
   }
 };