refactor header files

[nbds] / include / map.h

diff --git a/include/map.h b/include/map.h
index d670c35d17d877191fadd55938e8c87974c00575..357b66895f3b16ace6ae137226ab2599818e938a 100644 (file)
--- a/include/map.h
+++ b/include/map.h
@@ -1,20 +1,23 @@
 #ifndef MAP_H
 #define MAP_H
 
+#include "datatype.h"
+
 typedef struct map map_t;
-typedef enum stat { MAP_STAT_COUNT } map_stat_e;
-typedef enum { MAP_TYPE_HASHTABLE, MAP_TYPE_SKIPLIST, MAP_TYPE_LIST } map_type_e;
 
-map_t *  map_alloc  (map_type_e map_type);
-void     map_free   (map_t *map);
-void     map_print  (map_t *map);
-uint64_t map_stat   (map_t *map, map_stat_e stat_type);
+typedef const struct map_impl *map_type_t;
 
-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);
+extern map_type_t MAP_TYPE_HASHTABLE;
+
+map_t *  map_alloc  (map_type_t map_type, const datatype_t *key_type);
+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);
 
 #endif//MAP_H