all structures now support arbitrary type keys with a fast path for integers

[nbds] / include / map.h

diff --git a/include/map.h b/include/map.h
index 44b9d27ea979570be69760a4cc7afb6d368f6a4c..71d0ddee0b90e9c45547fb3576a1c58cb32736b3 100644 (file)
--- a/include/map.h
+++ b/include/map.h
@@ -5,17 +5,21 @@ typedef struct map map_t;
 
 typedef const struct map_impl *map_type_t;
 
+typedef int      (*cmp_fun_t)   (void *, void *);
+typedef void *   (*clone_fun_t) (void *);
+typedef uint32_t (*hash_fun_t)  (void *);
+
 extern map_type_t MAP_TYPE_HASHTABLE;
 extern map_type_t MAP_TYPE_SKIPLIST;
 extern map_type_t MAP_TYPE_LIST;
 
-map_t *  map_alloc  (map_type_t map_type);
-uint64_t map_get    (map_t *map, const void *key_data, uint32_t key_len);
-uint64_t map_set    (map_t *map, const void *key_data, uint32_t key_len, uint64_t new_val);
-uint64_t map_add    (map_t *map, const void *key_data, uint32_t key_len, uint64_t 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);
-uint64_t map_replace(map_t *map, const void *key_data, uint32_t key_len, uint64_t new_val);
-uint64_t map_remove (map_t *map, const void *key_data, uint32_t key_len);
+map_t *  map_alloc  (map_type_t map_type, cmp_fun_t cmp_fun, hash_fun_t hash_fun, clone_fun_t clone_fun);
+uint64_t map_get    (map_t *map, void *key);
+uint64_t map_set    (map_t *map, void *key, uint64_t new_val);
+uint64_t map_add    (map_t *map, void *key, uint64_t new_val);
+uint64_t map_cas    (map_t *map, void *key, uint64_t expected_val, uint64_t new_val);
+uint64_t map_replace(map_t *map, void *key, uint64_t new_val);
+uint64_t map_remove (map_t *map, void *key);
 uint64_t map_count  (map_t *map);
 void     map_print  (map_t *map);
 void     map_free   (map_t *map);