Merge with git+ssh://git.ucw.cz/projects/sherlock/GIT/sherlock.git#dev-sorter

[libucw.git] / lib / sorter / s-internal.h

diff --git a/lib/sorter/s-internal.h b/lib/sorter/s-internal.h
index 92a3ad64a8191409e5af1691f88b3a57b626b5d1..e581cecb7443b886b3c6954f9510d194051f3764 100644 (file)
--- a/lib/sorter/s-internal.h
+++ b/lib/sorter/s-internal.h
@@ -17,7 +17,12 @@ typedef struct {
 #define ASORT_PREFIX(x) SORT_PREFIX(array_##x)
 #define ASORT_KEY_TYPE P(internal_item_t)
 #define ASORT_LT(x,y) (P(compare)((x).key, (y).key) < 0)
-#define ASORT_PAGE_ALIGNED
+#ifdef SORT_INTERNAL_RADIX
+#  define ASORT_HASH(x) P(hash)((x).key)
+#    ifdef SORT_LONG_HASH
+#      define ASORT_LONG_HASH
+#    endif
+#endif
 #include "lib/sorter/array.h"
 
 /*
@@ -65,7 +70,7 @@ static inline size_t P(internal_workspace)(P(key) *key UNUSED)
 #ifdef SORT_UNIFY_WORKSPACE
   ws += SORT_UNIFY_WORKSPACE(*key);
 #endif
-#ifdef SORT_HASH_BITS
+#ifdef SORT_INTERNAL_RADIX
   ws = MAX(ws, sizeof(P(internal_item_t)));
 #endif
   return ws;
@@ -146,7 +151,7 @@ static int P(internal)(struct sort_context *ctx, struct sort_bucket *bin, struct
   timestamp_t timer;
   init_timer(&timer);
   item_array = P(array_sort)(item_array, count,
-#ifdef SORT_HASH_BITS
+#ifdef SORT_INTERNAL_RADIX
     workspace, bin->hash_bits
 #else
     NULL, 0