X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=lib%2Fbloom.c;h=33d093a33f6984cf7adc05b4e9092bb4d339300d;hb=42da5c8b2cdd53427145b623293bc5b915fb5f05;hp=b469fdedac0d57cc133bbbdc4067032a4950e13f;hpb=899834b5290bf6302a8a01d3c7672a9a200392c7;p=fio.git

diff --git a/lib/bloom.c b/lib/bloom.c
index b469fded..33d093a3 100644
--- a/lib/bloom.c
+++ b/lib/bloom.c
@@ -5,7 +5,9 @@
 #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;
@@ -21,27 +23,42 @@ struct bloom_hash {
 	uint32_t (*fn)(const void *, uint32_t, uint32_t);
 };
 
-static uint32_t b_crc32c(const void *buf, uint32_t len, uint32_t seed)
+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 = 0x8989,
+		.seed = BLOOM_SEED,
 		.fn = jhash,
 	},
 	{
-		.seed = 0x8989,
+		.seed = BLOOM_SEED,
 		.fn = XXH32,
 	},
 	{
-		.seed = 0,
-		.fn = b_crc32c,
+		.seed = BLOOM_SEED,
+		.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