From f38213fffe4e35d8e7e581bef83050be1eaa4444 Mon Sep 17 00:00:00 2001 From: tidwall Date: Fri, 17 Jul 2020 07:59:48 -0700 Subject: [PATCH] Added udata to comparator --- README.md | 4 ++-- hashmap.c | 35 +++++++++++++++++++++-------------- hashmap.h | 4 +++- 3 files changed, 26 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index 26c31b4..242b2ea 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ struct user { int age; }; -int user_compare(const void *a, const void *b) { +int user_compare(const void *a, const void *b, void *udata) { const struct user *ua = a; const struct user *ub = b; return strcmp(ua->name, ub->name); @@ -45,7 +45,7 @@ int main() { // argument is the initial capacity. The third and fourth arguments are // optional seeds that are passed to the following hash function. struct hashmap *map = hashmap_new(sizeof(struct user), 0, 0, 0, - user_hash, user_compare); + user_hash, user_compare, NULL); // Here we'll load some users into the hash map. Each set operation // performs a copy of the data that is pointed to in the second argument. diff --git a/hashmap.c b/hashmap.c index c595486..e159e10 100644 --- a/hashmap.c +++ b/hashmap.c @@ -42,7 +42,8 @@ struct hashmap { uint64_t seed0; uint64_t seed1; uint64_t (*hash)(const void *item, uint64_t seed0, uint64_t seed1); - int (*compare)(const void *a, const void *b); + int (*compare)(const void *a, const void *b, void *udata); + void *udata; size_t bucketsz; size_t nbuckets; size_t count; @@ -84,7 +85,9 @@ struct hashmap *hashmap_new(size_t elsize, size_t cap, uint64_t seed0, uint64_t seed1, uint64_t (*hash)(const void *item, uint64_t seed0, uint64_t seed1), - int (*compare)(const void *a, const void *b)) + int (*compare)(const void *a, const void *b, + void *udata), + void *udata) { int ncap = 16; if (cap < ncap) { @@ -110,6 +113,7 @@ struct hashmap *hashmap_new(size_t elsize, size_t cap, map->seed1 = seed1; map->hash = hash; map->compare = compare; + map->udata = udata; map->spare = ((char*)map)+sizeof(struct hashmap); map->cap = cap; map->nbuckets = cap; @@ -127,7 +131,8 @@ struct hashmap *hashmap_new(size_t elsize, size_t cap, static bool resize(struct hashmap *map, size_t new_cap) { struct hashmap *map2 = hashmap_new(map->elsize, new_cap, map->seed1, - map->seed1, map->hash, map->compare); + map->seed1, map->hash, map->compare, + map->udata); if (!map2) { return false; } @@ -194,7 +199,8 @@ void *hashmap_set(struct hashmap *map, void *item) { return NULL; } if (entry->hash == bucket->hash && - map->compare(bucket_item(entry), bucket_item(bucket)) == 0) + map->compare(bucket_item(entry), bucket_item(bucket), + map->udata) == 0) { memcpy(map->spare, bucket_item(bucket), map->elsize); memcpy(bucket_item(bucket), bucket_item(entry), map->elsize); @@ -224,7 +230,7 @@ void *hashmap_get(struct hashmap *map, void *key) { return NULL; } if (bucket->hash == hash && - map->compare(key, bucket_item(bucket)) == 0) + map->compare(key, bucket_item(bucket), map->udata) == 0) { return bucket_item(bucket); } @@ -247,7 +253,7 @@ void *hashmap_delete(struct hashmap *map, void *key) { return NULL; } if (bucket->hash == hash && - map->compare(key, bucket_item(bucket)) == 0) + map->compare(key, bucket_item(bucket), map->udata) == 0) { memcpy(map->spare, bucket_item(bucket), map->elsize); bucket->dib = 0; @@ -551,6 +557,10 @@ static int compare_ints(const void *a, const void *b) { return *(int*)a - *(int*)b; } +static int compare_ints_udata(const void *a, const void *b, void *udata) { + return *(int*)a - *(int*)b; +} + static uint64_t hash_int(const void *item, uint64_t seed0, uint64_t seed1) { return hashmap_murmur(item, sizeof(int), seed0, seed1); } @@ -576,7 +586,7 @@ static void all() { struct hashmap *map; while (!(map = hashmap_new(sizeof(int), 0, seed, seed, - hash_int, compare_ints))) {} + hash_int, compare_ints_udata, NULL))) {} shuffle(vals, N, sizeof(int)); for (int i = 0; i < N; i++) { // // printf("== %d ==\n", vals[i]); @@ -643,11 +653,6 @@ static void all() { assert(v && *v == vals[j]); } } - assert(map->cap == map->nbuckets); - - - - hashmap_free(map); xfree(vals); @@ -708,7 +713,8 @@ static void benchmarks() { struct hashmap *map; shuffle(vals, N, sizeof(int)); - map = hashmap_new(sizeof(int), 0, seed, seed, hash_int, compare_ints); + map = hashmap_new(sizeof(int), 0, seed, seed, hash_int, compare_ints_udata, + NULL); bench("set", N, { int *v = hashmap_set(map, &vals[i]); assert(!v); @@ -725,7 +731,8 @@ static void benchmarks() { }) hashmap_free(map); - map = hashmap_new(sizeof(int), N, seed, seed, hash_int, compare_ints); + map = hashmap_new(sizeof(int), N, seed, seed, hash_int, compare_ints_udata, + NULL); bench("set (cap)", N, { int *v = hashmap_set(map, &vals[i]); assert(!v); diff --git a/hashmap.h b/hashmap.h index c8392e5..2c0457a 100644 --- a/hashmap.h +++ b/hashmap.h @@ -15,7 +15,9 @@ struct hashmap *hashmap_new(size_t elsize, size_t cap, uint64_t seed0, uint64_t seed1, uint64_t (*hash)(const void *item, uint64_t seed0, uint64_t seed1), - int (*compare)(const void *a, const void *b)); + int (*compare)(const void *a, const void *b, + void *udata), + void *udata); void hashmap_free(struct hashmap *map); size_t hashmap_count(struct hashmap *map); bool hashmap_oom(struct hashmap *map);