Removed sorter_presort_bufsize, it was no longer used.

diff --git a/lib/sorter/TODO b/lib/sorter/TODO
index ed0af57b3de5a42cdd31a7111a79e082f96b6412..c2b653d5b96f4b2e5a3861befdb1cbbeddc88cd8 100644 (file)
--- a/lib/sorter/TODO
+++ b/lib/sorter/TODO
@@ -10,6 +10,7 @@ o  Clean up introductory comments.
 o  Log messages should show both original and new size of the data. The speed
    should be probably calculated from the former.
 o  Automatically tune ASORT_MIN_RADIX, ASORT_MIN_SHIFT and especially ASORT_RADIX_BITS.
+o  Buffer sizing in shep-export.
 
 Improvements:
 o  Switching between direct and normal I/O. Should use normal I/O if the input is small enough.

diff --git a/lib/sorter/common.h b/lib/sorter/common.h
index ad16382a6c732229d494a52914e22aa2d2595c7b..deee9e0449578a6189ba61fc7d4ffab99a530934 100644 (file)
--- a/lib/sorter/common.h
+++ b/lib/sorter/common.h
@@ -13,7 +13,7 @@
 #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;

diff --git a/lib/sorter/config.c b/lib/sorter/config.c
index 6f6e94274dff5fae472fd2a950a67b09e7dfcd3a..178b190437fd05360c0f9c5b26840907d2c0168f 100644 (file)
--- a/lib/sorter/config.c
+++ b/lib/sorter/config.c
@@ -13,7 +13,6 @@
 #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;
@@ -28,7 +27,6 @@ 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),