Changeset 1902 for trunk/src/kmk/dir.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/dir.c (modified) (14 diffs)

trunk/src/kmk/dir.c

@@ -377 +377 @@
   };
 
+#ifndef CONFIG_WITH_STRCACHE2
 static unsigned long
 directory_hash_1 (const void *key)
 {
-#ifndef CONFIG_WITH_STRCACHE2
   return_ISTRING_HASH_1 (((const struct directory *) key)->name);
-#else
-  return strcache2_get_ptr_hash (&file_strcache, ((const struct directory *) key)->name);
-#endif
 }
 
@@ -390 +387 @@
 directory_hash_2 (const void *key)
 {
-#ifndef CONFIG_WITH_STRCACHE2
   return_ISTRING_HASH_2 (((const struct directory *) key)->name);
-#else
-  return strcache2_get_hash1 (&file_strcache, ((const struct directory *) key)->name);
-#endif
 }
 
@@ -400 +393 @@
 directory_hash_cmp (const void *x, const void *y)
 {
-#ifndef CONFIG_WITH_STRCACHE2
   return_ISTRING_COMPARE (((const struct directory *) x)->name,
                           ((const struct directory *) y)->name);
-#else
-  return ((const struct directory *) x)->name
-      == ((const struct directory *) y)->name ? 0 : -1;
-#endif
-}
+}
+#endif /* !CONFIG_WITH_STRCACHE2 */
 
 /* Table of directories hashed by name.  */
@@ -433 +422 @@
   };
 
+#ifndef CONFIG_WITH_STRCACHE2
 static unsigned long
 dirfile_hash_1 (const void *key)
 {
-#ifndef CONFIG_WITH_STRCACHE2
   return_ISTRING_HASH_1 (((struct dirfile const *) key)->name);
-#else
-  return strcache2_get_ptr_hash (&file_strcache, ((struct dirfile const *) key)->name);
-#endif
 }
 
@@ -446 +432 @@
 dirfile_hash_2 (const void *key)
 {
-#ifndef CONFIG_WITH_STRCACHE2
   return_ISTRING_HASH_2 (((struct dirfile const *) key)->name);
-#else
-  return strcache2_get_hash1 (&file_strcache, ((struct dirfile const *) key)->name);
-#endif
 }
 
@@ -458 +440 @@
   const struct dirfile *x = xv;
   const struct dirfile *y = yv;
-#ifndef CONFIG_WITH_STRCACHE2
   int result = x->length - y->length;
   if (result)
     return result;
   return_ISTRING_COMPARE (x->name, y->name);
-#else
-  return x->name == y->name ? 0 : -1;
-#endif
-}
+}
+#endif /* !CONFIG_WITH_STRCACHE2 */
 
 #ifndef DIRFILE_BUCKETS
@@ -510 +489 @@
 #ifndef CONFIG_WITH_STRCACHE2
   dir_key.name = name;
+  dir_slot = (struct directory **) hash_find_slot (&directories, &dir_key);
 #else
   p = name + strlen (name);
   dir_key.name = strcache_add_len (name, p - name);
-#endif
-  dir_slot = (struct directory **) hash_find_slot (&directories, &dir_key);
+  dir_slot = (struct directory **) hash_find_slot_strcached (&directories, &dir_key);
+#endif
   dir = *dir_slot;
 
@@ -657 +637 @@
                   if (buckets < DIRFILE_BUCKETS)
                     buckets = DIRFILE_BUCKETS;
-                  hash_init (&dc->dirfiles, buckets,
-                             dirfile_hash_1, dirfile_hash_2, dirfile_hash_cmp);
-#else
+                  hash_init_strcached (&dc->dirfiles, buckets, &file_strcache,
+                                       offsetof (struct dirfile, name));
+#else
+# ifndef CONFIG_WITH_STRCACHE2
                   hash_init (&dc->dirfiles, DIRFILE_BUCKETS,
                              dirfile_hash_1, dirfile_hash_2, dirfile_hash_cmp);
+# else  /* CONFIG_WITH_STRCACHE2 */
+                  hash_init_strcached (&dc->dirfiles, DIRFILE_BUCKETS,
+                                       &file_strcache,
+                                       offsetof (struct dirfile, name));
+# endif /* CONFIG_WITH_STRCACHE2 */
 #endif
                   /* Keep track of how many directories are open.  */
@@ -730 +716 @@
       dirfile_key.name = filename;
       dirfile_key.length = strlen (filename);
+      df = hash_find_item (&dir->dirfiles, &dirfile_key);
 #else  /* CONFIG_WITH_STRCACHE2 */
       dirfile_key.length = strlen (filename);
       dirfile_key.name = filename
         = strcache_add_len (filename, dirfile_key.length);
+      df = hash_find_item_strcached (&dir->dirfiles, &dirfile_key);
 #endif /* CONFIG_WITH_STRCACHE2 */
-      df = hash_find_item (&dir->dirfiles, &dirfile_key);
       if (df)
         return !df->impossible;
@@ -811 +798 @@
 /* bird: end */
           if (errno)
-            fatal (NILF, "INTERNAL: readdir(%p): %s (filename=%s)\n", dir, strerror (errno), filename);
+            fatal (NILF, "INTERNAL: readdir(%p): %s (filename=%s)\n", (void *)dir, strerror (errno), filename);
           break;
         }
@@ -829 +816 @@
 #ifndef CONFIG_WITH_STRCACHE2
       dirfile_key.name = d->d_name;
-#else
-      dirfile_key.name = strcache_add_len (d->d_name, len);
-#endif
       dirfile_key.length = len;
       dirfile_slot = (struct dirfile **) hash_find_slot (&dir->dirfiles, &dirfile_key);
+#else
+      dirfile_key.name = strcache_add_len (d->d_name, len);
+      dirfile_key.length = len;
+      dirfile_slot = (struct dirfile **) hash_find_slot_strcached (&dir->dirfiles, &dirfile_key);
+#endif
 #ifdef WINDOWS32
       /*
@@ -1028 +1017 @@
   if (dir->contents->dirfiles.ht_vec == 0)
     {
+#ifndef CONFIG_WITH_STRCACHE2
       hash_init (&dir->contents->dirfiles, DIRFILE_BUCKETS,
                  dirfile_hash_1, dirfile_hash_2, dirfile_hash_cmp);
+#else  /* CONFIG_WITH_STRCACHE2 */
+      hash_init_strcached (&dir->contents->dirfiles, DIRFILE_BUCKETS,
+                           &file_strcache, offsetof (struct dirfile, name));
+#endif /* CONFIG_WITH_STRCACHE2 */
     }
 
@@ -1122 +1116 @@
   dirfile_key.name = filename;
   dirfile_key.length = strlen (filename);
+  dirfile = hash_find_item (&dir->dirfiles, &dirfile_key);
 #else
   dirfile_key.length = strlen (filename);
   dirfile_key.name = strcache_add_len (filename, dirfile_key.length);
-#endif
-  dirfile = hash_find_item (&dir->dirfiles, &dirfile_key);
+  dirfile = hash_find_item_strcached (&dir->dirfiles, &dirfile_key);
+#endif
   if (dirfile)
     return dirfile->impossible;
@@ -1398 +1393 @@
 hash_init_directories (void)
 {
+#ifndef CONFIG_WITH_STRCACHE2
   hash_init (&directories, DIRECTORY_BUCKETS,
              directory_hash_1, directory_hash_2, directory_hash_cmp);
+#else  /*  */
+  hash_init_strcached (&directories, DIRECTORY_BUCKETS, &file_strcache,
+                       offsetof (struct directory, name));
+#endif /*  */
   hash_init (&directory_contents, DIRECTORY_BUCKETS,
              directory_contents_hash_1, directory_contents_hash_2,