Changeset 1914 in kBuild

Timestamp:

Oct 22, 2008 9:25:49 PM (16 years ago)

Author:

bird

Message:

strcache2: strcache2_get_ptr_hash -> strcache2_calc_ptr_hash.

Location:

trunk/src/kmk

Files:

• dir.c (modified) (1 diff)
• hash.c (modified) (1 diff)
• strcache2.h (modified) (2 diffs)
• variable.c (modified) (1 diff)

trunk/src/kmk/dir.c

@@ -264 +264 @@
   ISTRING_HASH_1 (key->path_key, hash);
 # else  /* CONFIG_WITH_STRCACHE2 */
-  hash = strcache2_get_ptr_hash (&file_strcache, key->path_key);
+  hash = strcache2_calc_ptr_hash (&file_strcache, key->path_key);
 # endif /* CONFIG_WITH_STRCACHE2 */
   hash ^= ((unsigned int) key->dev << 4) ^ (unsigned int) key->ctime;

trunk/src/kmk/hash.c

@@ -179 +179 @@
   const char *str1 = *(const char **)((const char *)key + ht->ht_off_string);
   const char *str2;
-  unsigned int hash_1 = strcache2_get_ptr_hash (ht->ht_strcache, str1);
+  unsigned int hash_1 = strcache2_calc_ptr_hash (ht->ht_strcache, str1);
   unsigned int hash_2;
 

trunk/src/kmk/strcache2.h

@@ -147 +147 @@
 }
 
-/* Get the pointer hash value for the string.
+/* Calc the pointer hash value for the string.
 
    This takes the string address, shift out the bits that are always zero
@@ -156 +156 @@
    involve any memory accesses, just a right SHIFT and an optional AND. */
 MY_INLINE unsigned int
-strcache2_get_ptr_hash (struct strcache2 *cache, const char *str)
+strcache2_calc_ptr_hash (struct strcache2 *cache, const char *str)
 {
   (void)cache;

trunk/src/kmk/variable.c

@@ -464 +464 @@
     }
 
-  hash_1 = strcache2_get_ptr_hash (&variable_strcache, name);
+  hash_1 = strcache2_calc_ptr_hash (&variable_strcache, name);
   ht = &setlist->set->table;
   idx = hash_1 & (ht->ht_size - 1);