projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bloom: allow to pass in whether to set bits for strings
[fio.git]
/
lib
/
bloom.c
diff --git
a/lib/bloom.c
b/lib/bloom.c
index ee4ba0baabcc80c40d13ede42ccb204d4530c9d9..9ccec5fa14a0c2cf2d6794efc754a9e894cab06b 100644
(file)
--- a/
lib/bloom.c
+++ b/
lib/bloom.c
@@
-35,7
+35,7
@@
static uint32_t bloom_fnv(const void *buf, uint32_t len, uint32_t seed)
#define BLOOM_SEED 0x8989
#define BLOOM_SEED 0x8989
-struct bloom_hash hashes[] = {
+st
atic st
ruct bloom_hash hashes[] = {
{
.seed = BLOOM_SEED,
.fn = jhash,
{
.seed = BLOOM_SEED,
.fn = jhash,
@@
-88,14
+88,14
@@
void bloom_free(struct bloom *b)
free(b);
}
free(b);
}
-static
int __bloom_check(struct bloom *b, uint32_t *data, unsigned int nwords
,
-
int
set)
+static
bool __bloom_check(struct bloom *b, const void *data, unsigned int len
,
+
bool
set)
{
uint32_t hash[N_HASHES];
int i, was_set;
for (i = 0; i < N_HASHES; i++) {
{
uint32_t hash[N_HASHES];
int i, was_set;
for (i = 0; i < N_HASHES; i++) {
- hash[i] = hashes[i].fn(data,
nwords
, hashes[i].seed);
+ hash[i] = hashes[i].fn(data,
len
, hashes[i].seed);
hash[i] = hash[i] % b->nentries;
}
hash[i] = hash[i] % b->nentries;
}
@@
-113,7
+113,13
@@
static int __bloom_check(struct bloom *b, uint32_t *data, unsigned int nwords,
return was_set == N_HASHES;
}
return was_set == N_HASHES;
}
-
int
bloom_set(struct bloom *b, uint32_t *data, unsigned int nwords)
+
bool
bloom_set(struct bloom *b, uint32_t *data, unsigned int nwords)
{
{
- return __bloom_check(b, data, nwords, 1);
+ return __bloom_check(b, data, nwords * sizeof(uint32_t), true);
+}
+
+bool bloom_string(struct bloom *b, const char *data, unsigned int len,
+ bool set)
+{
+ return __bloom_check(b, data, len, set);
}
}