Changeset 9f4067b6 in mainline for uspace/lib/c/generic

Timestamp:

2012-10-09T21:16:13Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

6659037, 7d248e3

Parents:

d1ef4a1 (diff), 97b199b1 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from lp:~jakub/helenos/gsoc2012-uspace-hash-table-from-adam.

Location:

uspace/lib/c/generic

Files:

• adt/hash_set.c (deleted)
• adt/hash_table.c (modified) (7 diffs)
• async.c (modified) (13 diffs)

uspace/lib/c/generic/adt/hash_table.c

@@ -1 +1 @@
 /*
  * Copyright (c) 2008 Jakub Jermar
+ * Copyright (c) 2012 Adam Hraska
+ * 
  * All rights reserved.
  *
@@ -34 +36 @@
 
 /*
- * This is an implementation of generic chained hash table.
+ * This is an implementation of a generic resizable chained hash table.
+ * 
+ * The table grows to 2*n+1 buckets each time, starting at n == 89, 
+ * per Thomas Wang's recommendation:
+ * http://www.concentric.net/~Ttwang/tech/hashsize.htm
+ * 
+ * This policy produces prime table sizes for the first five resizes
+ * and generally produces table sizes which are either prime or 
+ * have fairly large (prime/odd) divisors. Having a prime table size
+ * mitigates the use of suboptimal hash functions and distributes
+ * items over the whole table.
  */
 
@@ -44 +56 @@
 #include <str.h>
 
+/* Optimal initial bucket count. See comment above. */
+#define HT_MIN_BUCKETS  89
+/* The table is resized when the average load per bucket exceeds this number. */
+#define HT_MAX_LOAD     2
+
+
+static size_t round_up_size(size_t);
+static bool alloc_table(size_t, list_t **);
+static void clear_items(hash_table_t *);
+static void resize(hash_table_t *, size_t);
+static void grow_if_needed(hash_table_t *);
+static void shrink_if_needed(hash_table_t *);
+
+/* Dummy do nothing callback to invoke in place of remove_callback == NULL. */
+static void nop_remove_callback(ht_link_t *item)
+{
+        /* no-op */
+}
+
+
 /** Create chained hash table.
  *
  * @param h        Hash table structure. Will be initialized by this call.
- * @param m        Number of hash table buckets.
+ * @param init_size Initial desired number of hash table buckets. Pass zero
+ *                 if you want the default initial size. 
  * @param max_keys Maximal number of keys needed to identify an item.
- * @param op       Hash table operations structure.
+ * @param op       Hash table operations structure. remove_callback()
+ *                 is optional and can be NULL if no action is to be taken
+ *                 upon removal. equal() is optional if and only if
+ *                 hash_table_insert_unique() will never be invoked.
+ *                 All other operations are mandatory. 
  *
  * @return True on success
  *
  */
-bool hash_table_create(hash_table_t *h, hash_count_t m, hash_count_t max_keys,
-    hash_table_operations_t *op)
+bool hash_table_create(hash_table_t *h, size_t init_size, size_t max_load,
+    hash_table_ops_t *op)
 {
         assert(h);
-        assert(op && op->hash && op->compare);
-        assert(max_keys > 0);
-        
-        h->entry = malloc(m * sizeof(list_t));
-        if (!h->entry)
+        assert(op && op->hash && op->key_hash && op->key_equal);
+        
+        /* Check for compulsory ops. */
+        if (!op || !op->hash || !op->key_hash || !op->key_equal)
                 return false;
         
-        memset((void *) h->entry, 0,  m * sizeof(list_t));
-        
-        hash_count_t i;
-        for (i = 0; i < m; i++)
-                list_initialize(&h->entry[i]);
-        
-        h->entries = m;
-        h->max_keys = max_keys;
+        h->bucket_cnt = round_up_size(init_size);
+        
+        if (!alloc_table(h->bucket_cnt, &h->bucket))
+                return false;
+        
+        h->max_load = (max_load == 0) ? HT_MAX_LOAD : max_load;
+        h->item_cnt = 0;
         h->op = op;
+        h->full_item_cnt = h->max_load * h->bucket_cnt;
+        h->apply_ongoing = false;
+
+        if (h->op->remove_callback == NULL) {
+                h->op->remove_callback = nop_remove_callback;
+        }
         
         return true;
 }
 
+/** Destroy a hash table instance.
+ *
+ * @param h Hash table to be destroyed.
+ *
+ */
+void hash_table_destroy(hash_table_t *h)
+{
+        assert(h && h->bucket);
+        assert(!h->apply_ongoing);
+        
+        clear_items(h);
+        
+        free(h->bucket);
+
+        h->bucket = 0;
+        h->bucket_cnt = 0;
+}
+
+/** Returns true if there are no items in the table. */
+bool hash_table_empty(hash_table_t *h)
+{
+        assert(h && h->bucket);
+        return h->item_cnt == 0;
+}
+
+/** Returns the number of items in the table. */
+size_t hash_table_size(hash_table_t *h)
+{
+        assert(h && h->bucket);
+        return h->item_cnt;
+}
+
 /** Remove all elements from the hash table
  *
@@ -84 +157 @@
 void hash_table_clear(hash_table_t *h)
 {
-        for (hash_count_t chain = 0; chain < h->entries; ++chain) {
-                link_t *cur;
-                link_t *next;
-                
-                for (cur = h->entry[chain].head.next;
-                    cur != &h->entry[chain].head;
-                    cur = next) {
-                        next = cur->next;
+        assert(h && h->bucket);
+        assert(!h->apply_ongoing);
+        
+        clear_items(h);
+        
+        /* Shrink the table to its minimum size if possible. */
+        if (HT_MIN_BUCKETS < h->bucket_cnt) {
+                resize(h, HT_MIN_BUCKETS);
+        }
+}
+
+/** Unlinks and removes all items but does not resize. */
+static void clear_items(hash_table_t *h)
+{
+        if (h->item_cnt == 0)
+                return;
+        
+        for (size_t idx = 0; idx < h->bucket_cnt; ++idx) {
+                list_foreach_safe(h->bucket[idx], cur, next) {
+                        assert(cur);
+                        ht_link_t *cur_link = member_to_inst(cur, ht_link_t, link);
+                        
                         list_remove(cur);
-                        h->op->remove_callback(cur);
-                }
-        }
-}
-
-/** Destroy a hash table instance.
- *
- * @param h Hash table to be destroyed.
- *
- */
-void hash_table_destroy(hash_table_t *h)
-{
-        assert(h);
-        assert(h->entry);
-        
-        free(h->entry);
+                        h->op->remove_callback(cur_link);
+                }
+        }
+        
+        h->item_cnt = 0;
 }
 
@@ -117 +193 @@
  * @param item Item to be inserted into the hash table.
  */
-void hash_table_insert(hash_table_t *h, unsigned long key[], link_t *item)
+void hash_table_insert(hash_table_t *h, ht_link_t *item)
 {
         assert(item);
-        assert(h && h->op && h->op->hash && h->op->compare);
-        
-        hash_index_t chain = h->op->hash(key);
-        assert(chain < h->entries);
-        
-        list_append(item, &h->entry[chain]);
+        assert(h && h->bucket);
+        assert(!h->apply_ongoing);
+        
+        size_t idx = h->op->hash(item) % h->bucket_cnt;
+        
+        list_append(&item->link, &h->bucket[idx]);
+        ++h->item_cnt;
+        grow_if_needed(h);
+}
+
+
+/** Insert item into a hash table if not already present.
+ *
+ * @param h    Hash table.
+ * @param key  Array of all keys necessary to compute hash index.
+ * @param item Item to be inserted into the hash table.
+ * 
+ * @return False if such an item had already been inserted. 
+ * @return True if the inserted item was the only item with such a lookup key.
+ */
+bool hash_table_insert_unique(hash_table_t *h, ht_link_t *item)
+{
+        assert(item);
+        assert(h && h->bucket && h->bucket_cnt);
+        assert(h->op && h->op->hash && h->op->equal);
+        assert(!h->apply_ongoing);
+        
+        size_t idx = h->op->hash(item) % h->bucket_cnt;
+        
+        /* Check for duplicates. */
+        list_foreach(h->bucket[idx], cur) {
+                /* 
+                 * We could filter out items using their hashes first, but 
+                 * calling equal() might very well be just as fast.
+                 */
+                ht_link_t *cur_link = member_to_inst(cur, ht_link_t, link);
+                if (h->op->equal(cur_link, item))
+                        return false;
+        }
+        
+        list_append(&item->link, &h->bucket[idx]);
+        ++h->item_cnt;
+        grow_if_needed(h);
+        
+        return true;
 }
 
@@ -136 +251 @@
  *
  */
-link_t *hash_table_find(hash_table_t *h, unsigned long key[])
-{
-        assert(h && h->op && h->op->hash && h->op->compare);
-        
-        hash_index_t chain = h->op->hash(key);
-        assert(chain < h->entries);
-        
-        list_foreach(h->entry[chain], cur) {
-                if (h->op->compare(key, h->max_keys, cur)) {
-                        /*
-                         * The entry is there.
-                         */
-                        return cur;
-                }
-        }
-        
+ht_link_t *hash_table_find(const hash_table_t *h, void *key)
+{
+        assert(h && h->bucket);
+        
+        size_t idx = h->op->key_hash(key) % h->bucket_cnt;
+
+        list_foreach(h->bucket[idx], cur) {
+                ht_link_t *cur_link = member_to_inst(cur, ht_link_t, link);
+                /* 
+                 * Is this is the item we are looking for? We could have first 
+                 * checked if the hashes match but op->key_equal() may very well be 
+                 * just as fast as op->hash().
+                 */
+                if (h->op->key_equal(key, cur_link)) {
+                        return cur_link;
+                }
+        }
+        
+        return NULL;
+}
+
+/** Find the next item equal to item. */
+ht_link_t *hash_table_find_next(const hash_table_t *h, ht_link_t *item)
+{
+        assert(item);
+        assert(h && h->bucket);
+
+        /* Traverse the circular list until we reach the starting item again. */
+        for (link_t *cur = item->link.next; cur != &item->link; cur = cur->next) {
+                assert(cur);
+                ht_link_t *cur_link = member_to_inst(cur, ht_link_t, link);
+                /* 
+                 * Is this is the item we are looking for? We could have first 
+                 * checked if the hashes match but op->equal() may very well be 
+                 * just as fast as op->hash().
+                 */
+                if (h->op->equal(cur_link, item)) {
+                        return cur_link;
+                }
+        }
+
         return NULL;
 }
@@ -163 +303 @@
  *             the hash table.
  * @param keys Number of keys in the 'key' array.
- *
- */
-void hash_table_remove(hash_table_t *h, unsigned long key[], hash_count_t keys)
-{
-        assert(h && h->op && h->op->hash && h->op->compare &&
-            h->op->remove_callback);
-        assert(keys <= h->max_keys);
-        
-        if (keys == h->max_keys) {
-                /*
-                 * All keys are known, hash_table_find() can be used to find the
-                 * entry.
+ * 
+ * @return Returns the number of removed items.
+ */
+size_t hash_table_remove(hash_table_t *h, void *key)
+{
+        assert(h && h->bucket);
+        assert(!h->apply_ongoing);
+        
+        size_t idx = h->op->key_hash(key) % h->bucket_cnt;
+
+        size_t removed = 0;
+        
+        list_foreach_safe(h->bucket[idx], cur, next) {
+                ht_link_t *cur_link = member_to_inst(cur, ht_link_t, link);
+                
+                if (h->op->key_equal(key, cur_link)) {
+                        ++removed;
+                        list_remove(cur);
+                        h->op->remove_callback(cur_link);
+                }
+        }
+
+        h->item_cnt -= removed;
+        shrink_if_needed(h);
+        
+        return removed;
+}
+
+/** Removes an item already present in the table. The item must be in the table.*/
+void hash_table_remove_item(hash_table_t *h, ht_link_t *item)
+{
+        assert(item);
+        assert(h && h->bucket);
+        assert(link_in_use(&item->link));
+
+        list_remove(&item->link);
+        --h->item_cnt;
+        h->op->remove_callback(item);
+        shrink_if_needed(h);
+}
+
+/** Apply function to all items in hash table.
+ *
+ * @param h   Hash table.
+ * @param f   Function to be applied. Return false if no more items 
+ *            should be visited. The functor may only delete the supplied
+ *            item. It must not delete the successor of the item passed 
+ *            in the first argument.
+ * @param arg Argument to be passed to the function.
+ */
+void hash_table_apply(hash_table_t *h, bool (*f)(ht_link_t *, void *), void *arg)
+{       
+        assert(f);
+        assert(h && h->bucket);
+        
+        if (h->item_cnt == 0)
+                return;
+        
+        h->apply_ongoing = true;
+        
+        for (size_t idx = 0; idx < h->bucket_cnt; ++idx) {
+                list_foreach_safe(h->bucket[idx], cur, next) {
+                        ht_link_t *cur_link = member_to_inst(cur, ht_link_t, link);
+                        /* 
+                         * The next pointer had already been saved. f() may safely 
+                         * delete cur (but not next!).
+                         */
+                        if (!f(cur_link, arg))
+                                return;
+                }
+        }
+        
+        h->apply_ongoing = false;
+        
+        shrink_if_needed(h);
+        grow_if_needed(h);
+}
+
+/** Rounds up size to the nearest suitable table size. */
+static size_t round_up_size(size_t size)
+{
+        size_t rounded_size = HT_MIN_BUCKETS;
+        
+        while (rounded_size < size) {
+                rounded_size = 2 * rounded_size + 1;
+        }
+        
+        return rounded_size;
+}
+
+/** Allocates and initializes the desired number of buckets. True if successful.*/
+static bool alloc_table(size_t bucket_cnt, list_t **pbuckets)
+{
+        assert(pbuckets && HT_MIN_BUCKETS <= bucket_cnt);
+                
+        list_t *buckets = malloc(bucket_cnt * sizeof(list_t));
+        if (!buckets)
+                return false;
+        
+        for (size_t i = 0; i < bucket_cnt; i++)
+                list_initialize(&buckets[i]);
+
+        *pbuckets = buckets;
+        return true;
+}
+
+
+/** Shrinks the table if the table is only sparely populated. */
+static inline void shrink_if_needed(hash_table_t *h)
+{
+        if (h->item_cnt <= h->full_item_cnt / 4 && HT_MIN_BUCKETS < h->bucket_cnt) {
+                /* 
+                 * Keep the bucket_cnt odd (possibly also prime). 
+                 * Shrink from 2n + 1 to n. Integer division discards the +1.
                  */
-                
-                link_t *cur = hash_table_find(h, key);
-                if (cur) {
-                        list_remove(cur);
-                        h->op->remove_callback(cur);
-                }
-                
+                size_t new_bucket_cnt = h->bucket_cnt / 2;
+                resize(h, new_bucket_cnt);
+        }
+}
+
+/** Grows the table if table load exceeds the maximum allowed. */
+static inline void grow_if_needed(hash_table_t *h)
+{
+        /* Grow the table if the average bucket load exceeds the maximum. */
+        if (h->full_item_cnt < h->item_cnt) {
+                /* Keep the bucket_cnt odd (possibly also prime). */
+                size_t new_bucket_cnt = 2 * h->bucket_cnt + 1;
+                resize(h, new_bucket_cnt);
+        }
+}
+
+/** Allocates and rehashes items to a new table. Frees the old table. */
+static void resize(hash_table_t *h, size_t new_bucket_cnt) 
+{
+        assert(h && h->bucket);
+        assert(HT_MIN_BUCKETS <= new_bucket_cnt);
+        
+        /* We are traversing the table and resizing would mess up the buckets. */
+        if (h->apply_ongoing)
                 return;
-        }
-        
-        /*
-         * Fewer keys were passed.
-         * Any partially matching entries are to be removed.
-         */
-        hash_index_t chain;
-        for (chain = 0; chain < h->entries; chain++) {
-                for (link_t *cur = h->entry[chain].head.next;
-                    cur != &h->entry[chain].head;
-                    cur = cur->next) {
-                        if (h->op->compare(key, keys, cur)) {
-                                link_t *hlp;
-                                
-                                hlp = cur;
-                                cur = cur->prev;
-                                
-                                list_remove(hlp);
-                                h->op->remove_callback(hlp);
-                                
-                                continue;
+        
+        list_t *new_buckets;
+
+        /* Leave the table as is if we cannot resize. */
+        if (!alloc_table(new_bucket_cnt, &new_buckets))
+                return;
+        
+        if (0 < h->item_cnt) {
+                /* Rehash all the items to the new table. */
+                for (size_t old_idx = 0; old_idx < h->bucket_cnt; ++old_idx) {
+                        list_foreach_safe(h->bucket[old_idx], cur, next) {
+                                ht_link_t *cur_link = member_to_inst(cur, ht_link_t, link);
+
+                                size_t new_idx = h->op->hash(cur_link) % new_bucket_cnt;
+                                list_remove(cur);
+                                list_append(cur, &new_buckets[new_idx]);
                         }
                 }
         }
-}
-
-/** Apply function to all items in hash table.
- *
- * @param h   Hash table.
- * @param f   Function to be applied.
- * @param arg Argument to be passed to the function.
- *
- */
-void hash_table_apply(hash_table_t *h, void (*f)(link_t *, void *), void *arg)
-{       
-        for (hash_index_t bucket = 0; bucket < h->entries; bucket++) {
-                link_t *cur;
-                link_t *next;
-
-                for (cur = h->entry[bucket].head.next; cur != &h->entry[bucket].head;
-                    cur = next) {
-                        /*
-                         * The next pointer must be stored prior to the functor
-                         * call to allow using destructor as the functor (the
-                         * free function could overwrite the cur->next pointer).
-                         */
-                        next = cur->next;
-                        f(cur, arg);
-                }
-        }
-}
+        
+        free(h->bucket);
+        h->bucket = new_buckets;
+        h->bucket_cnt = new_bucket_cnt;
+        h->full_item_cnt = h->max_load * h->bucket_cnt;
+}
+
 
 /** @}

uspace/lib/c/generic/async.c

@@ -116 +116 @@
 #include "private/libc.h"
 
-#define CLIENT_HASH_TABLE_BUCKETS  32
-#define CONN_HASH_TABLE_BUCKETS    32
 
 /** Session data */
@@ -205 +203 @@
 /* Client connection data */
 typedef struct {
-        link_t link;
+        ht_link_t link;
         
         task_id_t in_task_id;
@@ -217 +215 @@
         
         /** Hash table link. */
-        link_t link;
+        ht_link_t link;
         
         /** Incoming client task ID. */
@@ -393 +391 @@
 static LIST_INITIALIZE(timeout_list);
 
-static hash_index_t client_hash(unsigned long key[])
-{
-        assert(key);
-        
-        return (((key[0]) >> 4) % CLIENT_HASH_TABLE_BUCKETS);
-}
-
-static int client_compare(unsigned long key[], hash_count_t keys, link_t *item)
-{
-        assert(key);
-        assert(keys == 2);
-        assert(item);
-        
-        client_t *client = hash_table_get_instance(item, client_t, link);
-        return (key[0] == LOWER32(client->in_task_id) &&
-            (key[1] == UPPER32(client->in_task_id)));
-}
-
-static void client_remove(link_t *item)
-{
-}
+static size_t client_key_hash(void *k)
+{
+        task_id_t key = *(task_id_t*)k;
+        return key;
+}
+
+static size_t client_hash(const ht_link_t *item)
+{
+        client_t *client = hash_table_get_inst(item, client_t, link);
+        return client_key_hash(&client->in_task_id);
+}
+
+static bool client_key_equal(void *k, const ht_link_t *item)
+{
+        task_id_t key = *(task_id_t*)k;
+        client_t *client = hash_table_get_inst(item, client_t, link);
+        return key == client->in_task_id;
+}
+
 
 /** Operations for the client hash table. */
-static hash_table_operations_t client_hash_table_ops = {
+static hash_table_ops_t client_hash_table_ops = {
         .hash = client_hash,
-        .compare = client_compare,
-        .remove_callback = client_remove
+        .key_hash = client_key_hash,
+        .key_equal = client_key_equal,
+        .equal = NULL,
+        .remove_callback = NULL
 };
 
@@ -429 +427 @@
  *
  */
-static hash_index_t conn_hash(unsigned long key[])
-{
-        assert(key);
-        
-        return (((key[0]) >> 4) % CONN_HASH_TABLE_BUCKETS);
-}
-
-/** Compare hash table item with a key.
- *
- * @param key  Array containing the source phone hash as the only item.
- * @param keys Expected 1 but ignored.
- * @param item Connection hash table item.
- *
- * @return True on match, false otherwise.
- *
- */
-static int conn_compare(unsigned long key[], hash_count_t keys, link_t *item)
-{
-        assert(key);
-        assert(item);
-        
-        connection_t *conn = hash_table_get_instance(item, connection_t, link);
-        return (key[0] == conn->in_phone_hash);
-}
-
-static void conn_remove(link_t *item)
-{
-}
+static size_t conn_key_hash(void *key)
+{
+        sysarg_t in_phone_hash  = *(sysarg_t*)key;
+        return in_phone_hash ;
+}
+
+static size_t conn_hash(const ht_link_t *item)
+{
+        connection_t *conn = hash_table_get_inst(item, connection_t, link);
+        return conn_key_hash(&conn->in_phone_hash);
+}
+
+static bool conn_key_equal(void *key, const ht_link_t *item)
+{
+        sysarg_t in_phone_hash = *(sysarg_t*)key;
+        connection_t *conn = hash_table_get_inst(item, connection_t, link);
+        return (in_phone_hash == conn->in_phone_hash);
+}
+
 
 /** Operations for the connection hash table. */
-static hash_table_operations_t conn_hash_table_ops = {
+static hash_table_ops_t conn_hash_table_ops = {
         .hash = conn_hash,
-        .compare = conn_compare,
-        .remove_callback = conn_remove
+        .key_hash = conn_key_hash,
+        .key_equal = conn_key_equal,
+        .equal = NULL,
+        .remove_callback = NULL
 };
 
@@ -510 +501 @@
         futex_down(&async_futex);
         
-        unsigned long key = call->in_phone_hash;
-        link_t *hlp = hash_table_find(&conn_hash_table, &key);
+        ht_link_t *hlp = hash_table_find(&conn_hash_table, &call->in_phone_hash);
         
         if (!hlp) {
@@ -518 +508 @@
         }
         
-        connection_t *conn = hash_table_get_instance(hlp, connection_t, link);
+        connection_t *conn = hash_table_get_inst(hlp, connection_t, link);
         
         msg_t *msg = malloc(sizeof(*msg));
@@ -698 +688 @@
 static client_t *async_client_get(task_id_t client_id, bool create)
 {
-        unsigned long key[2] = {
-                LOWER32(client_id),
-                UPPER32(client_id),
-        };
         client_t *client = NULL;
 
         futex_down(&async_futex);
-        link_t *lnk = hash_table_find(&client_hash_table, key);
+        ht_link_t *lnk = hash_table_find(&client_hash_table, &client_id);
         if (lnk) {
-                client = hash_table_get_instance(lnk, client_t, link);
+                client = hash_table_get_inst(lnk, client_t, link);
                 atomic_inc(&client->refcnt);
         } else if (create) {
@@ -716 +702 @@
                 
                         atomic_set(&client->refcnt, 1);
-                        hash_table_insert(&client_hash_table, key, &client->link);
+                        hash_table_insert(&client_hash_table, &client->link);
                 }
         }
@@ -727 +713 @@
 {
         bool destroy;
-        unsigned long key[2] = {
-                LOWER32(client->in_task_id),
-                UPPER32(client->in_task_id)
-        };
-        
+
         futex_down(&async_futex);
         
         if (atomic_predec(&client->refcnt) == 0) {
-                hash_table_remove(&client_hash_table, key, 2);
+                hash_table_remove(&client_hash_table, &client->in_task_id);
                 destroy = true;
         } else
@@ -831 +813 @@
          */
         futex_down(&async_futex);
-        unsigned long key = fibril_connection->in_phone_hash;
-        hash_table_remove(&conn_hash_table, &key, 1);
+        hash_table_remove(&conn_hash_table, &fibril_connection->in_phone_hash);
         futex_up(&async_futex);
         
@@ -916 +897 @@
         
         /* Add connection to the connection hash table */
-        unsigned long key = conn->in_phone_hash;
         
         futex_down(&async_futex);
-        hash_table_insert(&conn_hash_table, &key, &conn->link);
+        hash_table_insert(&conn_hash_table, &conn->link);
         futex_up(&async_futex);
         
@@ -1111 +1091 @@
 void __async_init(void)
 {
-        if (!hash_table_create(&client_hash_table, CLIENT_HASH_TABLE_BUCKETS,
-            2, &client_hash_table_ops))
+        if (!hash_table_create(&client_hash_table, 0, 0, &client_hash_table_ops))
                 abort();
         
-        if (!hash_table_create(&conn_hash_table, CONN_HASH_TABLE_BUCKETS,
-            1, &conn_hash_table_ops))
+        if (!hash_table_create(&conn_hash_table, 0, 0, &conn_hash_table_ops))
                 abort();