summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/hash.c5
-rw-r--r--lib/hash.h2
-rw-r--r--lib/thread.c4
3 files changed, 6 insertions, 5 deletions
diff --git a/lib/hash.c b/lib/hash.c
index 6db79ea7..1e097f28 100644
--- a/lib/hash.c
+++ b/lib/hash.c
@@ -31,6 +31,7 @@ hash_create_size (unsigned int size, unsigned int (*hash_key) (void *),
{
struct hash *hash;
+ assert ((size & (size-1)) == 0);
hash = XMALLOC (MTYPE_HASH, sizeof (struct hash));
hash->index = XCALLOC (MTYPE_HASH_INDEX,
sizeof (struct hash_backet *) * size);
@@ -71,7 +72,7 @@ hash_get (struct hash *hash, void *data, void * (*alloc_func) (void *))
struct hash_backet *backet;
key = (*hash->hash_key) (data);
- index = key % hash->size;
+ index = key & (hash->size - 1);
for (backet = hash->index[index]; backet != NULL; backet = backet->next)
if (backet->key == key && (*hash->hash_cmp) (backet->data, data))
@@ -125,7 +126,7 @@ hash_release (struct hash *hash, void *data)
struct hash_backet *pp;
key = (*hash->hash_key) (data);
- index = key % hash->size;
+ index = key & (hash->size - 1);
for (backet = pp = hash->index[index]; backet; backet = backet->next)
{
diff --git a/lib/hash.h b/lib/hash.h
index 4cb772e5..a6dd5319 100644
--- a/lib/hash.h
+++ b/lib/hash.h
@@ -41,7 +41,7 @@ struct hash
/* Hash backet. */
struct hash_backet **index;
- /* Hash table size. */
+ /* Hash table size. Must be power of 2 */
unsigned int size;
/* Key make function. */
diff --git a/lib/thread.c b/lib/thread.c
index 16c92c24..27c29d6c 100644
--- a/lib/thread.c
+++ b/lib/thread.c
@@ -531,8 +531,8 @@ thread_master_create ()
{
if (cpu_record == NULL)
cpu_record
- = hash_create_size (1011, (unsigned int (*) (void *))cpu_record_hash_key,
- (int (*) (const void *, const void *))cpu_record_hash_cmp);
+ = hash_create ((unsigned int (*) (void *))cpu_record_hash_key,
+ (int (*) (const void *, const void *))cpu_record_hash_cmp);
return (struct thread_master *) XCALLOC (MTYPE_THREAD_MASTER,
sizeof (struct thread_master));