Changeset 1858 in kBuild for trunk/src/kmk

Timestamp:

Oct 13, 2008 4:35:21 AM (16 years ago)

Author:

bird

Message:

kmk: Added hash_find_slot_prehashed for the benefit of the strcache and includedep.

Location:

trunk/src/kmk

Files:

• hash.c (modified) (1 diff)
• hash.h (modified) (1 diff)
• strcache.c (modified) (3 diffs)

trunk/src/kmk/hash.c

@@ -123 +123 @@
     }
 }
+
+#ifdef CONFIG_WITH_VALUE_LENGTH
+/* A variant of hash_find_slot that takes the hash values as arguments.
+   The HASH_2 argument is optional, pass 0 if not available.
+   Not having to call ht_hash_1 and perhaps also not ht_hash_2 does save
+   a whole bunch of cycles in some of the kBuild use cases (strcache sees
+   serious usage there). */
+void **
+hash_find_slot_prehashed (struct hash_table *ht, const void *key,
+                          unsigned int hash_1, unsigned int hash_2)
+{
+  void **slot;
+  void **deleted_slot = 0;
+
+  ht->ht_lookups++;
+#ifdef CONFIG_WITH_MAKE_STATS
+  make_stats_ht_lookups++;
+#endif
+  for (;;)
+    {
+      hash_1 &= (ht->ht_size - 1);
+      slot = &ht->ht_vec[hash_1];
+
+      if (*slot == 0)
+        return (deleted_slot ? deleted_slot : slot);
+      if (*slot == hash_deleted_item)
+        {
+          if (deleted_slot == 0)
+            deleted_slot = slot;
+        }
+      else
+        {
+          if (key == *slot)
+            return slot;
+          if ((*ht->ht_compare) (key, *slot) == 0)
+            return slot;
+          ht->ht_collisions++;
+#ifdef CONFIG_WITH_MAKE_STATS
+          make_stats_ht_collisions++;
+#endif
+        }
+      if (!hash_2)
+          hash_2 = (*ht->ht_hash_2) (key) | 1;
+      hash_1 += hash_2;
+    }
+}
+
+#endif /* CONFIG_WITH_VALUE_LENGTH */
 
 void *

trunk/src/kmk/hash.h

@@ -63 +63 @@
                     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));

trunk/src/kmk/strcache.c

@@ -164 +164 @@
 str_hash_1 (const void *key)
 {
+#if 0
 #ifdef CONFIG_WITH_VALUE_LENGTH
   if (MY_PREDICT_TRUE ((const char *) key == lookup_string))
     return lookup_prefix->hash1;
+#endif
 #endif
   return_ISTRING_HASH_1 ((const char *) key);
@@ -237 +239 @@
 add_hash (const char *str, int len, unsigned long hash1, unsigned long hash2)
 {
-  char *const *slot;
+  void const **slot;
   const char *key;
   struct strcache_pref prefix;
@@ -251 +253 @@
   lookup_prefix = &prefix;
 
-  slot = (char *const *) hash_find_slot (&strings, str);
-  key = *slot;
+  slot = hash_find_slot_prehashed (&strings, str, prefix.hash1, prefix.hash2);
+  key = *(const char **)slot;
 
   /* Count the total number of adds we performed.  */