From: Martin Mares <mj@ucw.cz>
Date: Fri, 7 Sep 2007 12:33:26 +0000 (+0200)
Subject: Merge with git+ssh://git.ucw.cz/projects/sherlock/GIT/sherlock.git#dev-sorter
X-Git-Tag: holmes-import~506^2~13^2~49^2
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=1f05348cde42852d77da3457b96a33dff1600ca4;p=libucw.git

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

1f05348cde42852d77da3457b96a33dff1600ca4
diff --cc lib/sorter/array.h
index 76f108cb,aa75e05a..aa0e2266
--- a/lib/sorter/array.h
+++ b/lib/sorter/array.h
@@@ -24,12 -24,13 +24,14 @@@
   *			defined by the sorter)
   *  ASORT_KEY_TYPE  [*]	data type of a single array entry key
   *  ASORT_LT(x,y)	x < y for ASORT_TYPE (default: "x<y")
-  *  ASORT_THRESHOLD	threshold for switching between quicksort and insertsort
-  *  ASORT_PAGE_ALIGNED	the array is guaranteed to be aligned to a multiple of CPU_PAGE_SIZE  (FIXME: Do we need this?)
   *  ASORT_HASH(x)	a monotone hash function (safisfying hash(x) < hash(y) => x<y)
 + *  ASORT_LONG_HASH	hashes are 64-bit numbers (default is 32 bits)
-  *  ASORT_RADIX_BITS	FIXME
-  *  ASORT_SWAP		FIXME: probably keep private
+  *
+  *  Fine-tuning parameters: (if you really insist)
+  *
+  *  ASORT_THRESHOLD	threshold for switching between quicksort and insertsort
+  *  ASORT_RADIX_BITS	how many bits of the hash functions are to be used at once for
+  *			radix-sorting.
   *
   *  After including this file, a function
   * 	ASORT_KEY_TYPE *ASORT_PREFIX(sort)(ASORT_KEY_TYPE *array, uns num_elts, ASORT_KEY_TYPE *buf, uns hash_bits)
diff --cc lib/sorter/s-fixint.h
index e2a24b5b,de152b0a..d901a064
--- a/lib/sorter/s-fixint.h
+++ b/lib/sorter/s-fixint.h
@@@ -12,12 -12,8 +12,11 @@@
  #define ASORT_PREFIX(x) SORT_PREFIX(array_##x)
  #define ASORT_KEY_TYPE P(key)
  #define ASORT_LT(x,y) (P(compare)(&(x), &(y)) < 0)
- #define ASORT_PAGE_ALIGNED
  #ifdef SORT_INTERNAL_RADIX
 -#define ASORT_HASH(x) P(hash)(&(x))
 +#  define ASORT_HASH(x) P(hash)(&(x))
 +#    ifdef SORT_LONG_HASH
 +#      define ASORT_LONG_HASH
 +#    endif
  #endif
  #include "lib/sorter/array.h"
  
diff --cc lib/sorter/s-internal.h
index 3e9b55b7,765ed4b9..e581cecb
--- a/lib/sorter/s-internal.h
+++ b/lib/sorter/s-internal.h
@@@ -17,13 -17,6 +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"
  
  /*