X-Git-Url: https://pd.if.org/git/?p=nbds;a=blobdiff_plain;f=include%2Fmap.h;h=60c3b6c0d3ac835327c8d5685f46f57e99eb3167;hp=42a5a1d2e8c2ebf1d2d196dc14506259e9aa466c;hb=HEAD;hpb=11572afcaf218cfcbb8e9747f22739f75252c4f4

diff --git a/include/map.h b/include/map.h
index 42a5a1d..60c3b6c 100644
--- a/include/map.h
+++ b/include/map.h
@@ -4,22 +4,62 @@
 #include "datatype.h"
 
 typedef struct map map_t;
+typedef struct map_iter map_iter_t;
+typedef struct map_impl map_impl_t;
 
-typedef const struct map_impl *map_type_t;
-
-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, 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);
+#ifdef NBD32
+typedef uint32_t map_key_t;
+typedef uint32_t map_val_t;
+#else
+typedef uint64_t map_key_t;
+typedef uint64_t map_val_t;
+#endif
+
+map_t *   map_alloc   (const map_impl_t *map_impl, const datatype_t *key_type);
+map_val_t map_get     (map_t *map, map_key_t key);
+map_val_t map_set     (map_t *map, map_key_t key, map_val_t new_val);
+map_val_t map_add     (map_t *map, map_key_t key, map_val_t new_val);
+map_val_t map_cas     (map_t *map, map_key_t key, map_val_t expected_val, map_val_t new_val);
+map_val_t map_replace (map_t *map, map_key_t key, map_val_t new_val);
+map_val_t map_remove  (map_t *map, map_key_t key);
+map_val_t map_count   (map_t *map);
+void      map_print   (map_t *map, int verbose);
+void      map_free    (map_t *map);
+
+map_iter_t * map_iter_begin (map_t *map, map_key_t key);
+map_val_t    map_iter_next  (map_iter_t *iter, map_key_t *key);
+void         map_iter_free  (map_iter_t *iter);
+
+/////////////////////////////////////////////////////////////////////////////////////
+
+#define CAS_EXPECT_DOES_NOT_EXIST ( 0)
+#define CAS_EXPECT_EXISTS         (-1)
+#define CAS_EXPECT_WHATEVER       (-2)
+
+typedef void *       (*map_alloc_t)  (const datatype_t *);
+typedef map_val_t    (*map_cas_t)    (void *, map_key_t , map_val_t, map_val_t);
+typedef map_val_t    (*map_get_t)    (void *, map_key_t );
+typedef map_val_t    (*map_remove_t) (void *, map_key_t );
+typedef size_t       (*map_count_t)  (void *);
+typedef void         (*map_print_t)  (void *, int);
+typedef void         (*map_free_t)   (void *);
+
+typedef map_iter_t * (*map_iter_begin_t) (void *, map_key_t);
+typedef map_val_t    (*map_iter_next_t)  (map_iter_t *, map_key_t *);
+typedef void         (*map_iter_free_t)  (map_iter_t *);
+
+struct map_impl {
+    map_alloc_t  alloc;
+    map_cas_t    cas;
+    map_get_t    get;
+    map_remove_t remove;
+    map_count_t  count;
+    map_print_t  print;
+    map_free_t   free_;
+
+    map_iter_begin_t iter_begin;
+    map_iter_next_t  iter_next;
+    map_iter_free_t  iter_free;
+};
 
 #endif//MAP_H