bloom: up hashes to 5 by default

[fio.git] / lib / bloom.c

diff --git a/lib/bloom.c b/lib/bloom.c
index 8059a65b29a5915c6eeee11ef3096566e19a6107..33d093a33f6984cf7adc05b4e9092bb4d339300d 100644 (file)
--- a/lib/bloom.c
+++ b/lib/bloom.c
@@ -6,6 +6,8 @@
 #include "../minmax.h"
 #include "../crc/xxhash.h"
 #include "../crc/murmur3.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;
 
 struct bloom {
        uint64_t nentries;


@@ -21,22 +23,42 @@ struct bloom_hash {
        uint32_t (*fn)(const void *, uint32_t, uint32_t);
 };
 
        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[] = {
        {
 struct bloom_hash hashes[] = {
        {

-               .seed = 0x8989,
+               .seed = BLOOM_SEED,

                .fn = jhash,
        },
        {
                .fn = jhash,
        },
        {

-               .seed = 0x8989,
+               .seed = BLOOM_SEED,

                .fn = XXH32,
        },
        {
                .fn = XXH32,
        },
        {

-               .seed = 0x8989,
+               .seed = BLOOM_SEED,

                .fn = murmurhash3,
        },
                .fn = murmurhash3,
        },

+       {
+               .seed = BLOOM_SEED,
+               .fn = bloom_crc32c,
+       },
+       {
+               .seed = BLOOM_SEED,
+               .fn = bloom_fnv,
+       },

 };
 
 };
 

-#define N_HASHES       3
+#define N_HASHES       5

 
 #define MIN_ENTRIES    1073741824UL
 
 
 #define MIN_ENTRIES    1073741824UL
 


@@ -45,6 +67,8 @@ struct bloom *bloom_new(uint64_t entries)
        struct bloom *b;
        size_t no_uints;
 
        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;
        b = malloc(sizeof(*b));
        b->nentries = entries;
        no_uints = (entries + BITS_PER_INDEX - 1) / BITS_PER_INDEX;