Radix sort bit width is now controlled by the configure script.

diff --git a/lib/autoconf.cfg b/lib/autoconf.cfg
index 77c7e7af84f7e864dcff329d0a1602f6509ac044..4bd1661781c42f5e0079dfa71381856450595136 100644 (file)
--- a/lib/autoconf.cfg
+++ b/lib/autoconf.cfg
@@ -259,6 +259,9 @@ Set("PARTMAP_IS_MMAP") if IsSet("CPU_64BIT_POINTERS");
 # Option for lib/mempool.c
 Set("POOL_IS_MMAP");
 
+# FIXME
+Set("CONFIG_UCW_RADIX_SORTER_BITS" => 12);
+
 # If debugging memory allocations:
 #LIBS+=-lefence
 #CDEBUG+=-DDEBUG_DMALLOC

diff --git a/lib/sorter/array.h b/lib/sorter/array.h
index 076f6d33dfd0f0858a90cab7a297a7f0251ebdb5..8cb05d3a445359397cdc807816b42b07b96044dc 100644 (file)
--- a/lib/sorter/array.h
+++ b/lib/sorter/array.h
@@ -62,7 +62,7 @@ typedef ASORT_KEY_TYPE Q(key);
 #endif
 
 #ifndef ASORT_RADIX_BITS
-#define ASORT_RADIX_BITS 12            // FIXME: Tune automatically?
+#define ASORT_RADIX_BITS CONFIG_UCW_RADIX_SORTER_BITS
 #endif
 #define ASORT_RADIX_MASK ((1 << (ASORT_RADIX_BITS)) - 1)