Changeset 1854 for trunk/src/kmk/strcache.c

Timestamp:

Oct 13, 2008, 3:50:33 AM (17 years ago)

Author:

bird

Message:

kmk: offload hashing of strcache entries to the includedep thread(s).

File:

• trunk/src/kmk/strcache.c (modified) (4 diffs)

trunk/src/kmk/strcache.c

@@ -131 +131 @@
 
 #ifdef CONFIG_WITH_VALUE_LENGTH
+/* Hackish globals for passing data to the hash functions.
+   There isn't really any other way without running the
+   risk of breaking rehashing. */
 static const char *lookup_string;
 static unsigned int lookup_string_len;
-#endif
+# ifdef CONFIG_WITH_INCLUDEDEP
+static unsigned long lookup_string_hash1;
+static unsigned long lookup_string_hash2;
+# endif /* CONFIG_WITH_INCLUDEDEP */
+#endif /* CONFIG_WITH_VALUE_LENGTH */
 
 static unsigned long
 str_hash_1 (const void *key)
 {
+#ifdef CONFIG_WITH_INCLUDEDEP
+  if ((const char *) key == lookup_string && lookup_string_hash1)
+    return lookup_string_hash1;
+#endif
   return_ISTRING_HASH_1 ((const char *) key);
 }
@@ -144 +155 @@
 str_hash_2 (const void *key)
 {
+#ifdef CONFIG_WITH_INCLUDEDEP
+  if ((const char *) key == lookup_string && lookup_string_hash2)
+    return lookup_string_hash2;
+#endif
   return_ISTRING_HASH_2 ((const char *) key);
 }
@@ -157 +172 @@
      kBuild scenario.  */
 
-  if (x == lookup_string)
+  if ((const char *) x == lookup_string)
     {
       assert (lookup_string_len == strlen ((const char *)x));
@@ -237 +252 @@
 }
 
+#ifdef CONFIG_WITH_INCLUDEDEP
+
+/* A special variant used by the includedep worker threads, it off loads
+   the main thread when it adds the strings to the cache later. */
+const char *
+strcache_add_prehashed (const char *str, int len, unsigned long hash1,
+                        unsigned long hash2)
+{
+  const char *retstr;
+
+  assert (hash1 == str_hash_1 (str));
+  assert (hash2 == str_hash_2 (str));
+
+  lookup_string_hash1 = hash1;
+  lookup_string_hash2 = hash2;
+
+  retstr = add_hash (str, len);
+
+  lookup_string_hash1 = 0;
+  lookup_string_hash2 = 0;
+
+  return retstr;
+}
+
+/* Performs the prehashing for use with strcache_add_prehashed(). */
+void
+strcache_prehash_str (const char *str, unsigned long *hash1p,
+                      unsigned long *hash2p)
+{
+  *hash1p = str_hash_1 (str);
+  *hash2p = str_hash_2 (str);
+}
+
+#endif /* CONFIG_WITH_INCLUDEDEP */
+
 int
 strcache_setbufsize(int size)