X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Ftdb2%2Fhash.c;h=56c5086e742552480a23e81a8e2a7baafe583d73;hb=cc2d609dfca7192305ad477b8c2b52cfdc1aa9be;hp=745f04c87e5574f50719b3018b4a78f7167fbbd6;hpb=703cea0c78a896c658272af06306218fc0bb23cc;p=ccan
diff --git a/ccan/tdb2/hash.c b/ccan/tdb2/hash.c
index 745f04c8..56c5086e 100644
--- a/ccan/tdb2/hash.c
+++ b/ccan/tdb2/hash.c
@@ -16,8 +16,20 @@
License along with this library; if not, see .
*/
#include "private.h"
+#include
#include
+/* Default hash function. */
+uint64_t tdb_jenkins_hash(const void *key, size_t length, uint64_t seed,
+ void *unused)
+{
+ uint64_t ret;
+ /* hash64_stable assumes lower bits are more important; they are a
+ * slightly better hash. We use the upper bits first, so swap them. */
+ ret = hash64_stable((const unsigned char *)key, length, seed);
+ return (ret >> 32) | (ret << 32);
+}
+
uint64_t tdb_hash(struct tdb_context *tdb, const void *ptr, size_t len)
{
return tdb->hash_fn(ptr, len, tdb->hash_seed, tdb->hash_data);
@@ -72,7 +84,7 @@ static tdb_bool_err key_matches(struct tdb_context *tdb,
const char *rkey;
if (rec_key_length(rec) != key->dsize) {
- add_stat(tdb, compare_wrong_keylen, 1);
+ tdb->stats.compare_wrong_keylen++;
return ret;
}
@@ -83,7 +95,7 @@ static tdb_bool_err key_matches(struct tdb_context *tdb,
if (memcmp(rkey, key->dptr, key->dsize) == 0)
ret = true;
else
- add_stat(tdb, compare_wrong_keycmp, 1);
+ tdb->stats.compare_wrong_keycmp++;
tdb_access_release(tdb, rkey);
return ret;
}
@@ -98,10 +110,10 @@ static tdb_bool_err match(struct tdb_context *tdb,
tdb_off_t off;
enum TDB_ERROR ecode;
- add_stat(tdb, compares, 1);
+ tdb->stats.compares++;
/* Desired bucket must match. */
if (h->home_bucket != (val & TDB_OFF_HASH_GROUP_MASK)) {
- add_stat(tdb, compare_wrong_bucket, 1);
+ tdb->stats.compare_wrong_bucket++;
return false;
}
@@ -109,7 +121,7 @@ static tdb_bool_err match(struct tdb_context *tdb,
if (bits_from(val, TDB_OFF_HASH_EXTRA_BIT, TDB_OFF_UPPER_STEAL_EXTRA)
!= bits_from(h->h, 64 - h->hash_used - TDB_OFF_UPPER_STEAL_EXTRA,
TDB_OFF_UPPER_STEAL_EXTRA)) {
- add_stat(tdb, compare_wrong_offsetbits, 1);
+ tdb->stats.compare_wrong_offsetbits++;
return false;
}
@@ -120,7 +132,7 @@ static tdb_bool_err match(struct tdb_context *tdb,
}
if ((h->h & ((1 << 11)-1)) != rec_hash(rec)) {
- add_stat(tdb, compare_wrong_rechash, 1);
+ tdb->stats.compare_wrong_rechash++;
return false;
}
@@ -492,11 +504,11 @@ static enum TDB_ERROR expand_group(struct tdb_context *tdb, struct hash_info *h)
bucket = fullest_bucket(tdb, h->group, h->home_bucket);
if (h->hash_used == 64) {
- add_stat(tdb, alloc_chain, 1);
+ tdb->stats.alloc_chain++;
subsize = sizeof(struct tdb_chain);
magic = TDB_CHAIN_MAGIC;
} else {
- add_stat(tdb, alloc_subhash, 1);
+ tdb->stats.alloc_subhash++;
subsize = (sizeof(tdb_off_t) << TDB_SUBLEVEL_HASH_BITS);
magic = TDB_HTABLE_MAGIC;
}