makary/bookmarkfs
1
0
Fork 0
mirror of https://git.sr.ht/~cismonx/bookmarkfs synced 2025-06-07 19:58:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

hashmap: tidy up log messages

Browse source
This commit is contained in:
CismonX 2025-03-08 13:44:38 +08:00
parent 9fab17734c
commit 1ed607de69
No known key found for this signature in database
GPG key ID: 3094873E29A482FB
1 changed files with 15 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/hashmap.c
View file

@ -206,8 +206,7 @@ make_room (
} }
} }
if (unlikely(b == end)) { if (unlikely(b == end)) {
debug_printf("make_room(): %s", // Reaching end of buckets, but no empty slot found
"reaching end of buckets, but no empty slot found");
return -1; return -1;
} }
@ -231,7 +230,6 @@ make_room (
} }
if (unlikely(swp == b)) { if (unlikely(swp == b)) {
// Not able to swap empty slot to the neighborhood of home bucket. // Not able to swap empty slot to the neighborhood of home bucket.
debug_printf("make_room(): %s", "neighborhood too crowded");
b->entry = NULL; b->entry = NULL;
return -1; return -1;
} }
@ -247,7 +245,7 @@ rehash (
unsigned new_exp = map->exp; unsigned new_exp = map->exp;
if (grow) { if (grow) {
if (unlikely(++new_exp > EXP_MAX)) { if (unlikely(++new_exp > EXP_MAX)) {
log_puts("rehash(): hashmap size exceeds max limit"); log_puts("hashmap size exceeds max limit");
return -1; return -1;
} }
} else { } else {
@ -273,7 +271,7 @@ rehash (
int hop_idx = make_room(new_home, new_buckets + new_nbuckets, new_exp); int hop_idx = make_room(new_home, new_buckets + new_nbuckets, new_exp);
if (unlikely(hop_idx < 0)) { if (unlikely(hop_idx < 0)) {
log_puts("rehash(): collision attack or poor hash function"); log_puts("collision attack or poor hash function");
goto fail; goto fail;
} }
BIT_SET(new_home->bits, hop_idx); BIT_SET(new_home->bits, hop_idx);
@ -346,26 +344,24 @@ hashmap_foreach (
) { ) {
struct bucket *end = map->buckets + map->num_buckets; struct bucket *end = map->buckets + map->num_buckets;
for (struct bucket *b = map->buckets; b < end; ++b) { for (struct bucket *b = map->buckets; b < end; ++b) {
void *entry = b->entry; if (b->entry != NULL) {
if (entry == NULL) { walk_func(user_data, b->entry);
continue;
} }
walk_func(user_data, b->entry);
} }
} }
void void
hashmap_delete ( hashmap_delete (
struct hashmap *h, struct hashmap *map,
void const *entry, void const *entry,
long entry_id long entry_id
) { ) {
struct bucket *home; struct bucket *home;
unsigned long hop_idx; unsigned long hop_idx;
if (entry_id < 0) { if (entry_id < 0) {
hop_idx = find_entry(h, entry, &home); hop_idx = find_entry(map, entry, &home);
} else { } else {
home = h->buckets + (entry_id >> HOP_IDX_WIDTH); home = map->buckets + (entry_id >> HOP_IDX_WIDTH);
hop_idx = entry_id & ((1 << HOP_IDX_WIDTH) - 1); hop_idx = entry_id & ((1 << HOP_IDX_WIDTH) - 1);
} }
BIT_UNSET(home->bits, hop_idx); BIT_UNSET(home->bits, hop_idx);
@ -374,15 +370,15 @@ hashmap_delete (
debug_assert(b->entry == entry); debug_assert(b->entry == entry);
b->entry = NULL; b->entry = NULL;
size_t buckets_used = --h->num_used; size_t buckets_used = --map->num_used;
if (h->exp <= EXP_MIN) { if (map->exp <= EXP_MIN) {
return; return;
} }
// load factor < 0.125 // load factor < 0.125
if (buckets_used < (h->num_buckets >> 3)) { if (buckets_used < (map->num_buckets >> 3)) {
debug_printf("hashmap_entry_delete(): rehashing (%zu/%zu)", debug_printf("%p: rehashing: %zu / %zu", (void *)map,
buckets_used, h->num_buckets); buckets_used, map->num_buckets - (map->exp - 1));
xassert(0 == rehash(h, false)); xassert(0 == rehash(map, false));
} }
} }
@ -398,7 +394,7 @@ hashmap_insert (
int hop_idx = make_room(home, map->buckets + map->num_buckets, exp); int hop_idx = make_room(home, map->buckets + map->num_buckets, exp);
if (unlikely(hop_idx < 0)) { if (unlikely(hop_idx < 0)) {
debug_printf("hashmap_insert(): rehashing (%zu/%zu)", debug_printf("%p: rehashing: %zu / %zu", (void *)map,
map->num_used, map->num_buckets - (exp - 1)); map->num_used, map->num_buckets - (exp - 1));
xassert(0 == rehash(map, true)); xassert(0 == rehash(map, true));
hashmap_insert(map, hashcode, entry); hashmap_insert(map, hashcode, entry);