Changeset 1902 for trunk/src/kmk/file.c

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/file.c (modified) (6 diffs)

trunk/src/kmk/file.c

@@ -41 +41 @@
 /* Hash table of files the makefile knows how to make.  */
 
+#ifndef CONFIG_WITH_STRCACHE2
 static unsigned long
 file_hash_1 (const void *key)
 {
-#ifndef CONFIG_WITH_STRCACHE2
   return_ISTRING_HASH_1 (((struct file const *) key)->hname);
-#else  /* CONFIG_WITH_STRCACHE2 */
-  return strcache2_get_ptr_hash (&file_strcache, ((struct file const *) key)->hname);
-#endif /* CONFIG_WITH_STRCACHE2 */
 }
 
@@ -54 +51 @@
 file_hash_2 (const void *key)
 {
-#ifndef CONFIG_WITH_STRCACHE2
   return_ISTRING_HASH_2 (((struct file const *) key)->hname);
-#else  /* CONFIG_WITH_STRCACHE2 */
-  return strcache2_get_ptr_hash (&file_strcache, ((struct file const *) key)->hname);
-#endif /* CONFIG_WITH_STRCACHE2 */
-}
+}
+#endif /* !CONFIG_WITH_STRCACHE2 */
 
 static int
@@ -148 +142 @@
       file_key.hname = strcache2_lookup (&file_strcache, name, strlen (name));
       if (file_key.hname)
-        f = hash_find_item (&files, &file_key);
+        f = hash_find_item_strcached (&files, &file_key);
       else
         f = NULL;
@@ -155 +149 @@
     {
       file_key.hname = name;
-      f = hash_find_item (&files, &file_key);
+      f = hash_find_item_strcached (&files, &file_key);
     }
 
@@ -296 +290 @@
 
   /* Remove the "from" file from the hash.  */
+#ifndef CONFIG_WITH_STRCACHE2
   deleted_file = hash_delete (&files, from_file);
+#else
+  deleted_file = hash_delete_strcached (&files, from_file);
+#endif
   if (deleted_file != from_file)
     /* from_file isn't the one stored in files */
@@ -1343 +1341 @@
 init_hash_files (void)
 {
-#ifdef KMK
+#ifndef CONFIG_WITH_STRCACHE2
+# ifdef KMK
   hash_init (&files, /*65535*/ 32755, file_hash_1, file_hash_2, file_hash_cmp);
+# else
+  hash_init (&files, 1000, file_hash_1, file_hash_2, file_hash_cmp);
+# endif
 #else
-  hash_init (&files, 1000, file_hash_1, file_hash_2, file_hash_cmp);
+# ifdef KMK
+  hash_init_strcached (&files, 32755, &file_strcache,
+                       offsetof (struct file, hname));
+# else
+  hash_init_strcached (&files, 1000, &file_strcache,
+                       offsetof (struct file, hname));
+# endif
 #endif
 }