Changeset 1909 for trunk/src/kmk/strcache2.h

Timestamp:

Oct 22, 2008, 8:49:48 PM (17 years ago)

Author:

bird

Message:

strcache2: Implemented collision resolution by chaining instead of open addressing. This is faster than the open addressing approach we're using.

File:

• trunk/src/kmk/strcache2.h (modified) (5 diffs)

trunk/src/kmk/strcache2.h

@@ -33 +33 @@
 
 #define STRCACHE2_USE_MASK 1
+#define STRCACHE2_USE_CHAINING 1
 
 /* string cache memory segment. */
@@ -47 +48 @@
 struct strcache2_entry
 {
+#ifdef STRCACHE2_USE_CHAINING
+    struct strcache2_entry *next;       /* Collision chain. */
+#endif
     void *user;
     unsigned int hash1;
+#ifndef STRCACHE2_USE_CHAINING
     unsigned int hash2;
+#endif
     unsigned int length;
 };
@@ -83 +89 @@
     unsigned long collision_3rd_count;  /* The number of 3rd level collisions. */
     unsigned int count;                 /* Number entries in the cache. */
+#ifdef STRCACHE2_USE_CHAINING
+    unsigned int collision_count;       /* Number of entries in chains. */
+#endif
     unsigned int rehash_count;          /* When to rehash the table. */
     unsigned int init_size;             /* The initial hash table size. */
@@ -146 +155 @@
 }
 
+#ifndef STRCACHE2_USE_CHAINING
 /* Get the second hash value for the string. */
 MY_INLINE unsigned int
@@ -155 +165 @@
   return hash2;
 }
+#endif
 
 /* Get the pointer hash value for the string.