client: use temp buffer for single output flush for json/disk util

[fio.git] / lib / bloom.c

diff --git a/lib/bloom.c b/lib/bloom.c
index 9ccec5fa14a0c2cf2d6794efc754a9e894cab06b..f4f9b6b9ee2dfd84e78990f99ddf67aa29e36a2d 100644 (file)
--- a/lib/bloom.c
+++ b/lib/bloom.c
@@ -1,9 +1,7 @@
 #include <stdlib.h>
-#include <inttypes.h>
 
 #include "bloom.h"
 #include "../hash.h"
-#include "../minmax.h"
 #include "../crc/xxhash.h"
 #include "../crc/murmur3.h"
 #include "../crc/crc32c.h"
@@ -60,19 +58,17 @@ static struct bloom_hash hashes[] = {
 
 #define N_HASHES       5
 
-#define MIN_ENTRIES    1073741824UL
-
 struct bloom *bloom_new(uint64_t entries)
 {
        struct bloom *b;
        size_t no_uints;
 
+       crc32c_arm64_probe();
        crc32c_intel_probe();
 
        b = malloc(sizeof(*b));
        b->nentries = entries;
        no_uints = (entries + BITS_PER_INDEX - 1) / BITS_PER_INDEX;
-       no_uints = max((unsigned long) no_uints, MIN_ENTRIES);
        b->map = calloc(no_uints, sizeof(uint32_t));
        if (!b->map) {
                free(b);
@@ -106,8 +102,10 @@ static bool __bloom_check(struct bloom *b, const void *data, unsigned int len,
 
                if (b->map[index] & (1U << bit))
                        was_set++;
-               if (set)
+               else if (set)
                        b->map[index] |= 1U << bit;
+               else
+                       break;
        }
 
        return was_set == N_HASHES;