Changeset 127 for pjproject/trunk/pjlib/src/pj/hash.c

Timestamp:

Jan 30, 2006 6:40:05 PM (18 years ago)

Author:

bennylp

Message:

Finished implementation of UA layer (to be tested)

File:

• pjproject/trunk/pjlib/src/pj/hash.c (modified) (8 diffs)

pjproject/trunk/pjlib/src/pj/hash.c

@@ -23 +23 @@
 #include <pj/os.h>
 #include <pj/ctype.h>
+#include <pj/assert.h>
 
 /**
@@ -58 +59 @@
             hash = hash * PJ_HASH_MULTIPLIER + *p;
         }
-        keylen = p - (const unsigned char*)key;
     } else {
         const unsigned char *p = key,
@@ -89 +89 @@
     unsigned table_size;
     
+    /* Check that PJ_HASH_ENTRY_SIZE is correct. */
+    PJ_ASSERT_RETURN(sizeof(pj_hash_entry)==PJ_HASH_ENTRY_SIZE, NULL);
+
     h = pj_pool_alloc(pool, sizeof(pj_hash_table_t));
     h->count = 0;
@@ -111 +114 @@
 static pj_hash_entry **find_entry( pj_pool_t *pool, pj_hash_table_t *ht, 
                                    const void *key, unsigned keylen,
-                                   void *val)
+                                   void *val, pj_uint32_t *hval,
+                                   void *entry_buf)
 {
     pj_uint32_t hash;
     pj_hash_entry **p_entry, *entry;
 
-    hash=0;
-    if (keylen==PJ_HASH_KEY_STRING) {
-        const unsigned char *p = key;
-        for ( ; *p; ++p ) {
-            hash = hash * PJ_HASH_MULTIPLIER + *p;
-        }
-        keylen = p - (const unsigned char*)key;
+    if (hval && *hval != 0) {
+        hash = *hval;
     } else {
-        const unsigned char *p = key,
-                            *end = p + keylen;
-        for ( ; p!=end; ++p) {
-            hash = hash * PJ_HASH_MULTIPLIER + *p;
-        }
+        /* This slightly differs with pj_hash_calc() because we need 
+         * to get the keylen when keylen is PJ_HASH_KEY_STRING.
+         */
+        hash=0;
+        if (keylen==PJ_HASH_KEY_STRING) {
+            const unsigned char *p = key;
+            for ( ; *p; ++p ) {
+                hash = hash * PJ_HASH_MULTIPLIER + *p;
+            }
+            keylen = p - (const unsigned char*)key;
+        } else {
+            const unsigned char *p = key,
+                                *end = p + keylen;
+            for ( ; p!=end; ++p) {
+                hash = hash * PJ_HASH_MULTIPLIER + *p;
+            }
+        }
+
+        /* Report back the computed hash. */
+        if (hval)
+            *hval = hash;
     }
 
@@ -137 +152 @@
     {
         if (entry->hash==hash && entry->keylen==keylen &&
-            memcmp(entry->key, key, keylen)==0) 
+            pj_memcmp(entry->key, key, keylen)==0) 
         {
             break;      
@@ -146 +161 @@
         return p_entry;
 
-    /* create a new entry */
-    entry = pj_pool_alloc(pool, sizeof(pj_hash_entry));
-    PJ_LOG(6, ("hashtbl", "%p: New p_entry %p created, pool used=%u, cap=%u", ht, entry, 
-                          pj_pool_get_used_size(pool), pj_pool_get_capacity(pool)));
+    /* Entry not found, create a new one. 
+     * If entry_buf is specified, use it. Otherwise allocate from pool.
+     */
+    if (entry_buf) {
+        entry = entry_buf;
+    } else {
+        /* Pool must be specified! */
+        PJ_ASSERT_RETURN(pool != NULL, NULL);
+
+        entry = pj_pool_alloc(pool, sizeof(pj_hash_entry));
+        PJ_LOG(6, ("hashtbl", 
+                   "%p: New p_entry %p created, pool used=%u, cap=%u", 
+                   ht, entry,  pj_pool_get_used_size(pool), 
+                   pj_pool_get_capacity(pool)));
+    }
     entry->next = NULL;
     entry->hash = hash;
@@ -163 +189 @@
 
 PJ_DEF(void *) pj_hash_get( pj_hash_table_t *ht,
-                            const void *key, unsigned keylen )
+                            const void *key, unsigned keylen,
+                            pj_uint32_t *hval)
 {
     pj_hash_entry *entry;
-    entry = *find_entry( NULL, ht, key, keylen, NULL);
+
+    if (hval) *hval = 0;
+    entry = *find_entry( NULL, ht, key, keylen, NULL, hval, NULL);
     return entry ? entry->value : NULL;
 }
 
 PJ_DEF(void) pj_hash_set( pj_pool_t *pool, pj_hash_table_t *ht,
-                          const void *key, unsigned keylen,
+                          const void *key, unsigned keylen, pj_uint32_t hval,
                           void *value )
 {
     pj_hash_entry **p_entry;
 
-    p_entry = find_entry( pool, ht, key, keylen, value );
+    p_entry = find_entry( pool, ht, key, keylen, value, &hval, NULL);
     if (*p_entry) {
         if (value == NULL) {
@@ -187 +216 @@
             /* overwrite */
             (*p_entry)->value = value;
-            PJ_LOG(6, ("hashtbl", "%p: p_entry %p value set to %p", ht, *p_entry, value));
+            PJ_LOG(6, ("hashtbl", "%p: p_entry %p value set to %p", ht, 
+                       *p_entry, value));
+        }
+    }
+}
+
+PJ_DEF(void) pj_hash_set_np( pj_hash_table_t *ht,
+                             const void *key, unsigned keylen, 
+                             pj_uint32_t hval, void *entry_buf, void *value)
+{
+    pj_hash_entry **p_entry;
+
+    p_entry = find_entry( NULL, ht, key, keylen, value, &hval, entry_buf );
+    if (*p_entry) {
+        if (value == NULL) {
+            /* delete entry */
+            PJ_LOG(6, ("hashtbl", "%p: p_entry %p deleted", ht, *p_entry));
+            *p_entry = (*p_entry)->next;
+            --ht->count;
+            
+        } else {
+            /* overwrite */
+            (*p_entry)->value = value;
+            PJ_LOG(6, ("hashtbl", "%p: p_entry %p value set to %p", ht, 
+                       *p_entry, value));
         }
     }