From 90afcc18dbf7cb6c682e1efb994007f03e304422 Mon Sep 17 00:00:00 2001 From: Martin Mares Date: Sat, 8 Sep 2007 22:53:46 +0200 Subject: [PATCH] Removed sorter_presort_bufsize, it was no longer used. --- lib/sorter/TODO | 1 + lib/sorter/common.h | 2 +- lib/sorter/config.c | 2 -- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/sorter/TODO b/lib/sorter/TODO index ed0af57b..c2b653d5 100644 --- 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 ad16382a..deee9e04 100644 --- 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 6f6e9427..178b1904 100644 --- 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), -- 2.39.5