projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move options_mem_dupe() to parse.c
[fio.git]
/
lib
/
bloom.c
diff --git
a/lib/bloom.c
b/lib/bloom.c
index f4eff575082b171827b8319d16b9c938f7a6a979..7a9ebaa9360ce4285a15d2129fa859e45b9c4ee5 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);
@@
-88,14
+86,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
+111,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 * sizeof(uint32_t), true);
+}
+
+bool bloom_string(struct bloom *b, const char *data, unsigned int len,
+ bool set)
{
{
- return __bloom_check(b, data,
nwords, 1
);
+ return __bloom_check(b, data,
len, set
);
}
}