Changeset 359

Timestamp:

2007-03-01T11:55:04+01:00 (6 years ago)

Author:

moo

Message:

merged from 1.2: fix for #71, fix inode hvalue issue by better hashing

Location:

trunk

Files:

• . (modified) (1 prop)
• xcache.c (modified) (2 diffs)

trunk/xcache.c

@@ -729 +729 @@
 #define HASH_STR(s) HASH_STR_L(s, strlen(s) + 1)
 #define HASH_NUM(n) HASH(n)
+static inline xc_hash_value_t xc_hash_fold(xc_hash_value_t hvalue, const xc_hash_t *hasher) /* {{{ fold hash bits as needed */
+{
+    xc_hash_value_t folded = 0;
+    while (hvalue) {
+        folded ^= (hvalue & hasher->mask);
+        hvalue >>= hasher->bits;
+    }
+    return folded;
+}
+/* }}} */
 static inline xc_hash_value_t xc_entry_hash_name(xc_entry_t *xce TSRMLS_DC) /* {{{ */
 {
@@ -843 +853 @@
 
     hv = xc_entry_hash_php(xce TSRMLS_CC);
-    cacheid = (hv & xc_php_hcache.mask);
+    cacheid = xc_hash_fold(hv, &xc_php_hcache);
     xce->cache = xc_php_caches[cacheid];
-    hv >>= xc_php_hcache.bits;
-    xce->hvalue = (hv & xc_php_hentry.mask);
+    xce->hvalue = xc_hash_fold(hv, &xc_php_hentry);
 
     xce->type = XC_TYPE_PHP;