summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2003-09-06 21:43:23 +0000
committerJeremy Allison <jra@samba.org>2003-09-06 21:43:23 +0000
commitc4b69a9ca1e7881aa6d37056ed12d8ccd18b0a41 (patch)
treeb1a86052628ff6358af2800b48d14404c4c0f491 /source3
parentdc7ea5851c94a40c32455bbba83e99b9453919e2 (diff)
downloadsamba-c4b69a9ca1e7881aa6d37056ed12d8ccd18b0a41.tar.gz
samba-c4b69a9ca1e7881aa6d37056ed12d8ccd18b0a41.tar.bz2
samba-c4b69a9ca1e7881aa6d37056ed12d8ccd18b0a41.zip
Use djb-algorithm string hash - faster than the tdb one we used to use.
Jeremy. (This used to be commit f094555ed9d4f72841869e79037d6ff980ebe324)
Diffstat (limited to 'source3')
-rw-r--r--source3/lib/hash.c15
1 files changed, 7 insertions, 8 deletions
diff --git a/source3/lib/hash.c b/source3/lib/hash.c
index c7b1493b4c..cd77b0b421 100644
--- a/source3/lib/hash.c
+++ b/source3/lib/hash.c
@@ -84,21 +84,20 @@ BOOL hash_table_init(hash_table *table, unsigned num_buckets, compare_function c
* For the last few chars that cannot be int'ed, use char instead.
* The function returns the bucket index number for the hashed
* key.
+ * JRA. Use a djb-algorithm hash for speed.
**************************************************************
*/
static int string_hash(int hash_size, const char *key)
{
- u32 value; /* Used to compute the hash value. */
- u32 i; /* Used to cycle through random values. */
-
- for (value = 0x238F13AF, i=0; key[i]; i++)
- value = (value + (key[i] << (i*5 % 24)));
-
- return (1103515243 * value + 12345) % hash_size;
+ u32 n = 0;
+ const char *p;
+ for (p = key; *p != '\0'; p++) {
+ n = ((n << 5) + n) ^ (u32)(*p++);
+ }
+ return (n % hash_size);
}
-
/* *************************************************************************
* Search the hash table for the entry in the hash chain.
* The function returns the pointer to the