bloom: kill unused function

[fio.git] / lib / bloom.c

diff --git a/lib/bloom.c b/lib/bloom.c
index 9ab89e4b6f29af482f210f98bd2a088a64d9c416..ee4ba0baabcc80c40d13ede42ccb204d4530c9d9 100644 (file)
--- a/lib/bloom.c
+++ b/lib/bloom.c
@@ -4,6 +4,10 @@
 #include "bloom.h"
 #include "../hash.h"
 #include "../minmax.h"
+#include "../crc/xxhash.h"
+#include "../crc/murmur3.h"
+#include "../crc/crc32c.h"
+#include "../crc/fnv.h"
 
 struct bloom {
        uint64_t nentries;
@@ -14,8 +18,47 @@ struct bloom {
 #define BITS_PER_INDEX (sizeof(uint32_t) * 8)
 #define BITS_INDEX_MASK        (BITS_PER_INDEX - 1)
 
-static unsigned int jhash_init[] = { 0, 0x12db635, 0x2a4a53 };
-#define N_HASHES       3
+struct bloom_hash {
+       unsigned int seed;
+       uint32_t (*fn)(const void *, uint32_t, uint32_t);
+};
+
+static uint32_t bloom_crc32c(const void *buf, uint32_t len, uint32_t seed)
+{
+       return fio_crc32c(buf, len);
+}
+
+static uint32_t bloom_fnv(const void *buf, uint32_t len, uint32_t seed)
+{
+       return fnv(buf, len, seed);
+}
+
+#define BLOOM_SEED     0x8989
+
+struct bloom_hash hashes[] = {
+       {
+               .seed = BLOOM_SEED,
+               .fn = jhash,
+       },
+       {
+               .seed = BLOOM_SEED,
+               .fn = XXH32,
+       },
+       {
+               .seed = BLOOM_SEED,
+               .fn = murmurhash3,
+       },
+       {
+               .seed = BLOOM_SEED,
+               .fn = bloom_crc32c,
+       },
+       {
+               .seed = BLOOM_SEED,
+               .fn = bloom_fnv,
+       },
+};
+
+#define N_HASHES       5
 
 #define MIN_ENTRIES    1073741824UL
 
@@ -24,6 +67,8 @@ struct bloom *bloom_new(uint64_t entries)
        struct bloom *b;
        size_t no_uints;
 
+       crc32c_intel_probe();
+
        b = malloc(sizeof(*b));
        b->nentries = entries;
        no_uints = (entries + BITS_PER_INDEX - 1) / BITS_PER_INDEX;
@@ -46,16 +91,18 @@ void bloom_free(struct bloom *b)
 static int __bloom_check(struct bloom *b, uint32_t *data, unsigned int nwords,
                         int set)
 {
-       uint32_t hashes[N_HASHES];
+       uint32_t hash[N_HASHES];
        int i, was_set;
 
-       for (i = 0; i < N_HASHES; i++)
-               hashes[i] = jhash(data, nwords, jhash_init[i]) % b->nentries;
+       for (i = 0; i < N_HASHES; i++) {
+               hash[i] = hashes[i].fn(data, nwords, hashes[i].seed);
+               hash[i] = hash[i] % b->nentries;
+       }
 
        was_set = 0;
        for (i = 0; i < N_HASHES; i++) {
-               const unsigned int index = hashes[i] / BITS_PER_INDEX;
-               const unsigned int bit = hashes[i] & BITS_INDEX_MASK;
+               const unsigned int index = hash[i] / BITS_PER_INDEX;
+               const unsigned int bit = hash[i] & BITS_INDEX_MASK;
 
                if (b->map[index] & (1U << bit))
                        was_set++;
@@ -66,11 +113,6 @@ static int __bloom_check(struct bloom *b, uint32_t *data, unsigned int nwords,
        return was_set == N_HASHES;
 }
 
-int bloom_check(struct bloom *b, uint32_t *data, unsigned int nwords)
-{
-       return __bloom_check(b, data, nwords, 0);
-}
-
 int bloom_set(struct bloom *b, uint32_t *data, unsigned int nwords)
 {
        return __bloom_check(b, data, nwords, 1);