Changeset 1902 for trunk/src/kmk/hash.h

Timestamp:

Oct 21, 2008, 5:57:00 AM (17 years ago)

Author:

bird

Message:

kmk: Moved the strcache hash optimizations into the hash code.

File:

• trunk/src/kmk/hash.h (modified) (3 diffs)

trunk/src/kmk/hash.h

@@ -54 +54 @@
   hash_func_t ht_hash_2;        /* secondary hash function */
   hash_cmp_func_t ht_compare;   /* comparison function */
+#ifdef CONFIG_WITH_STRCACHE2
+  struct strcache2 *ht_strcache; /* the string cache pointer. */
+  unsigned int ht_off_string;  /* offsetof (struct key, string) */
+#endif
 };
 
@@ -63 +67 @@
                     unsigned long cardinality, unsigned long size));
 void **hash_find_slot __P((struct hash_table *ht, void const *key));
-#ifdef CONFIG_WITH_VALUE_LENGTH
-void **hash_find_slot_prehashed __P((struct hash_table *ht, const void *key,
-                                     unsigned int hash_1, unsigned int hash_2));
-#endif
 void *hash_find_item __P((struct hash_table *ht, void const *key));
 void *hash_insert __P((struct hash_table *ht, const void *item));
@@ -84 +84 @@
 void **hash_dump __P((struct hash_table *ht, void **vector_0, qsort_cmp_t compare));
 
+#ifdef CONFIG_WITH_STRCACHE2
+void hash_init_strcached __P((struct hash_table *ht, unsigned long size,
+                              struct strcache2 *strcache, unsigned int off_strptr));
+void **hash_find_slot_strcached __P((struct hash_table *ht, const void *key));
+void *hash_find_item_strcached __P((struct hash_table *ht, void const *key));
+void *hash_insert_strcached __P((struct hash_table *ht, const void *item));
+void *hash_delete_strcached __P((struct hash_table *ht, void const *item));
+#endif /* CONFIG_WITH_STRCACHE2 */
+
 extern void *hash_deleted_item;
 #define HASH_VACANT(item) ((item) == 0 || (void *) (item) == hash_deleted_item)