Changeset 1897 in kBuild for trunk/src/kmk/dir.c

Timestamp:

Oct 21, 2008 1:21:39 AM (16 years ago)

Author:

bird

Message:

kmk: added strcache2_get_ptr_hash for more efficent hashing by string pool users; replacing hash1 with that and hash2 with hash1, thus avoiding unnecessary hash2 calculations.

File:

• trunk/src/kmk/dir.c (modified) (6 diffs)

trunk/src/kmk/dir.c

@@ -264 +264 @@
   ISTRING_HASH_1 (key->path_key, hash);
 # else  /* CONFIG_WITH_STRCACHE2 */
-  hash = strcache_get_hash1 (key->path_key);
+  hash = strcache2_get_ptr_hash (&file_cache, key->path_key);
 # endif /* CONFIG_WITH_STRCACHE2 */
   hash ^= ((unsigned int) key->dev << 4) ^ (unsigned int) key->ctime;
@@ -291 +291 @@
   ISTRING_HASH_2 (key->path_key, hash);
 # else  /* CONFIG_WITH_STRCACHE2 */
-  hash = strcache_get_hash2 (key->path_key);
+  hash = strcache2_get_hash1 (&file_cache, key->path_key);
 # endif /* CONFIG_WITH_STRCACHE2 */
   hash ^= ((unsigned int) key->dev << 4) ^ (unsigned int) ~key->ctime;
@@ -383 +383 @@
   return_ISTRING_HASH_1 (((const struct directory *) key)->name);
 #else
-  return strcache_get_hash1 (((const struct directory *) key)->name);
+  return strcache2_get_ptr_hash (&file_cache, ((const struct directory *) key)->name);
 #endif
 }
@@ -393 +393 @@
   return_ISTRING_HASH_2 (((const struct directory *) key)->name);
 #else
-  return strcache_get_hash2 (((const struct directory *) key)->name);
+  return strcache2_get_hash1 (&file_cache, ((const struct directory *) key)->name);
 #endif
 }
@@ -439 +439 @@
   return_ISTRING_HASH_1 (((struct dirfile const *) key)->name);
 #else
-  return strcache_get_hash1 (((struct dirfile const *) key)->name);
+  return strcache2_get_ptr_hash (&file_cache, ((struct dirfile const *) key)->name);
 #endif
 }
@@ -449 +449 @@
   return_ISTRING_HASH_2 (((struct dirfile const *) key)->name);
 #else
-  return strcache_get_hash2 (((struct dirfile const *) key)->name);
+  return strcache2_get_hash1 (&file_cache, ((struct dirfile const *) key)->name);
 #endif
 }