X-Git-Url: https://pd.if.org/git/?p=nbds;a=blobdiff_plain;f=map%2Fmap.c;fp=map%2Fmap.c;h=c4749b3cfc21f80eecfc43147f0000ee26ca52fd;hp=cb761ef3cddfb7b28f2dd80c67157e8bdcfb1033;hb=f1098084dd54496a61f9a254541190df77edd166;hpb=7378edffa5751159d35eab31eceb76a1f16231d0

diff --git a/map/map.c b/map/map.c
index cb761ef..c4749b3 100644
--- a/map/map.c
+++ b/map/map.c
@@ -15,11 +15,11 @@ struct map {
     void *data;
 };
 
-map_t *map_alloc (map_type_t map_type) { 
+map_t *map_alloc (map_type_t map_type, cmp_fun_t cmp_fun, hash_fun_t hash_fun, clone_fun_t clone_fun) { 
     const map_impl_t *map_impl = map_type;
     map_t *map = nbd_malloc(sizeof(map_t)); 
     map->impl  = map_impl;
-    map->data  = map->impl->alloc();
+    map->data  = map->impl->alloc(cmp_fun, hash_fun, clone_fun);
     return map;
 }
 
@@ -35,26 +35,26 @@ uint64_t map_count (map_t *map) {
     return map->impl->count(map->data);
 }
 
-uint64_t map_get (map_t *map, const void *key_data, uint32_t key_len) {
-    return map->impl->get(map->data, key_data, key_len);
+uint64_t map_get (map_t *map, void *key) {
+    return map->impl->get(map->data, key);
 }
 
-uint64_t map_set (map_t *map, const void *key_data, uint32_t key_len, uint64_t new_val) {
-    return map->impl->cas(map->data, key_data, key_len, CAS_EXPECT_WHATEVER, new_val);
+uint64_t map_set (map_t *map, void *key, uint64_t new_val) {
+    return map->impl->cas(map->data, key, CAS_EXPECT_WHATEVER, new_val);
 }
 
-uint64_t map_add (map_t *map, const void *key_data, uint32_t key_len, uint64_t new_val) {
-    return map->impl->cas(map->data, key_data, key_len, CAS_EXPECT_DOES_NOT_EXIST, new_val);
+uint64_t map_add (map_t *map, void *key, uint64_t new_val) {
+    return map->impl->cas(map->data, key, CAS_EXPECT_DOES_NOT_EXIST, new_val);
 }
 
-uint64_t map_cas (map_t *map, const void *key_data, uint32_t key_len, uint64_t expected_val, uint64_t new_val) {
-    return map->impl->cas(map->data, key_data, key_len, expected_val, new_val);
+uint64_t map_cas (map_t *map, void *key, uint64_t expected_val, uint64_t new_val) {
+    return map->impl->cas(map->data, key, expected_val, new_val);
 }
 
-uint64_t map_replace(map_t *map, const void *key_data, uint32_t key_len, uint64_t new_val) {
-    return map->impl->cas(map->data, key_data, key_len, CAS_EXPECT_EXISTS, new_val);
+uint64_t map_replace(map_t *map, void *key, uint64_t new_val) {
+    return map->impl->cas(map->data, key, CAS_EXPECT_EXISTS, new_val);
 }
 
-uint64_t map_remove (map_t *map, const void *key_data, uint32_t key_len) {
-    return map->impl->remove(map->data, key_data, key_len);
+uint64_t map_remove (map_t *map, void *key) {
+    return map->impl->remove(map->data, key);
 }