projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update compression documentation
[fio.git]
/
lib
/
bloom.c
diff --git
a/lib/bloom.c
b/lib/bloom.c
index c2e6c11f2e1444020ae18225f8277938827c37f9..bb81dbbdf8c9b285b1f43f3b339f346a90881a63 100644
(file)
--- a/
lib/bloom.c
+++ b/
lib/bloom.c
@@
-60,19
+60,17
@@
static struct bloom_hash hashes[] = {
#define N_HASHES 5
#define N_HASHES 5
-#define MIN_ENTRIES 1073741824UL
-
struct bloom *bloom_new(uint64_t entries)
{
struct bloom *b;
size_t no_uints;
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;
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);
b->map = calloc(no_uints, sizeof(uint32_t));
if (!b->map) {
free(b);
@@
-106,8
+104,10
@@
static bool __bloom_check(struct bloom *b, const void *data, unsigned int len,
if (b->map[index] & (1U << bit))
was_set++;
if (b->map[index] & (1U << bit))
was_set++;
- if (set)
+
else
if (set)
b->map[index] |= 1U << bit;
b->map[index] |= 1U << bit;
+ else
+ break;
}
return was_set == N_HASHES;
}
return was_set == N_HASHES;
@@
-118,7
+118,8
@@
bool bloom_set(struct bloom *b, uint32_t *data, unsigned int nwords)
return __bloom_check(b, data, nwords * sizeof(uint32_t), true);
}
return __bloom_check(b, data, nwords * sizeof(uint32_t), true);
}
-bool bloom_set_string(struct bloom *b, const char *data, unsigned int len)
+bool bloom_string(struct bloom *b, const char *data, unsigned int len,
+ bool set)
{
{
- return __bloom_check(b, data, len,
true
);
+ return __bloom_check(b, data, len,
set
);
}
}