Changeset 726 for branches

Timestamp:

05/07/06 07:24:49 (6 years ago)

Author:

wd

Message:

Update/fix hash bugs.

Location:

branches/ithildin-1.1

Files:

• include/ithildin/hash.h (modified) (3 diffs)
• source/hash.c (modified) (6 diffs)

branches/ithildin-1.1/include/ithildin/hash.h

@@ -22 +22 @@
 
 struct hashtable {
-    int     size;           /* thte size of the hash table */
+    uint32_t size;          /* thte size of the hash table */
 #define hashtable_size(x) ((x)->size)
-    int     entries;        /* number of entries in the hash table */
+    uint32_t entries;       /* number of entries in the hash table */
 #define hashtable_count(x) ((x)->entries)
     struct hashbucket *table;   /* our table */
@@ -35 +35 @@
     /* these are useful for debugging the state of the hash system */
 #ifdef DEBUG_CODE
-    int            max_per_bucket;  /* most entries in a single bucket */
-    int            empty_buckets;   /* number of empty buckets */
+    int     max_per_bucket; /* most entries in a single bucket */
+    uint32_t empty_buckets; /* number of empty buckets */
 #endif
 #define HASH_FL_NOCASE 0x1      /* ignore case (tolower before hash) */
@@ -55 +55 @@
 
 /* table management functions */
-hashtable_t *create_hash_table(int, size_t, size_t, int, const char *);
+hashtable_t *create_hash_table(uint32_t, size_t, size_t, int, const char *);
 void destroy_hash_table(hashtable_t *);
-void resize_hash_table(hashtable_t *table, int elems);
 int hash_insert(hashtable_t *, void *);
 int hash_delete(hashtable_t *, void *);

branches/ithildin-1.1/source/hash.c

@@ -13 +13 @@
 
 IDSTRING(rcsid, "$Id$");
+
+static void resize_hash_table(hashtable_t *table, uint32_t elems);
+static unsigned int hash_get_key_hash(hashtable_t *, void *, size_t);
 
 /*
@@ -30 +33 @@
  * out much in terms of speed.
  */
-hashtable_t *create_hash_table(int elems, size_t offset, size_t len,
+hashtable_t *create_hash_table(uint32_t elems, size_t offset, size_t len,
         int flags, const char *cmpname) {
     hashtable_t *htp = malloc(sizeof(hashtable_t));
-    u_int32_t real_elems = 0x80;
+    uint32_t real_elems = 0x80;
     
     /* Take elems and begin shifting real_elems to the left until it is
@@ -50 +53 @@
     if (real_elems > elems)
         real_elems >>= 1;
+
+    if (real_elems != elems)
+        log_debug("Request for %d element hash table adjusted to %d "
+                "elements", elems, real_elems);
 
     htp->size = real_elems;
@@ -57 +64 @@
 #ifdef DEBUG_CODE
     htp->max_per_bucket = 1;
-    htp->empty_buckets = elems;
+    htp->empty_buckets = real_elems;
 #endif
     htp->flags = flags;
@@ -92 +99 @@
  * efficient, however if used judiciously it should enhance performance, not
  * hinder it.  'elems' is the new size of the table. */
-void resize_hash_table(hashtable_t *table, int elems) {
+static void resize_hash_table(hashtable_t *table, uint32_t elems) {
     struct hashbucket *oldtable;
     int oldsize, i;
@@ -121 +128 @@
     free(oldtable);
 }
-
-static unsigned int hash_get_key_hash(hashtable_t *, void *, size_t);
 
 /*