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

Timestamp:

Oct 22, 2008, 11:17:27 PM (17 years ago)

Author:

bird

Message:

strcache2: collapsed the STRCACHE2_USE_CHAINING checks.

File:

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

trunk/src/kmk/strcache2.h

@@ -33 +33 @@
 
 #define STRCACHE2_USE_MASK 1
-#define STRCACHE2_USE_CHAINING 1
 
 /* string cache memory segment. */
@@ -48 +47 @@
 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;
 };
@@ -89 +83 @@
     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. */
@@ -155 +147 @@
 }
 
-#ifndef STRCACHE2_USE_CHAINING
-/* Get the second hash value for the string. */
-MY_INLINE unsigned int
-strcache2_get_hash2 (struct strcache2 *cache, const char *str)
-{
-  unsigned int hash2 = strcache2_get_entry (cache, str)->hash2;
-  if (!hash2)
-    hash2 = strcache2_get_hash2_fallback (cache, str);
-  return hash2;
-}
-#endif
-
 /* Get the pointer hash value for the string.