work in progress

[nbds] / include / map.h

diff --git a/include/map.h b/include/map.h
index 27e8dae00008cac7afef16bdde792c3dffcfccd1..60c3b6c0d3ac835327c8d5685f46f57e99eb3167 100644 (file)
--- a/include/map.h
+++ b/include/map.h
@@ -7,19 +7,27 @@ typedef struct map map_t;
 typedef struct map_iter map_iter_t;
 typedef struct map_impl map_impl_t;
 
-map_t *  map_alloc   (const map_impl_t *map_impl, 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);
-
-map_iter_t * map_iter_begin (map_t *map, void *key);
-uint64_t     map_iter_next  (map_iter_t *iter, void **key);
+#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);
 
 /////////////////////////////////////////////////////////////////////////////////////
@@ -28,16 +36,16 @@ void         map_iter_free  (map_iter_t *iter);
 #define CAS_EXPECT_EXISTS         (-1)
 #define CAS_EXPECT_WHATEVER       (-2)
 
-typedef void *   (*map_alloc_t)  (const datatype_t *);
-typedef uint64_t (*map_cas_t)    (map_impl_t *, void *, uint64_t, uint64_t);
-typedef uint64_t (*map_get_t)    (map_impl_t *, void *);
-typedef uint64_t (*map_remove_t) (map_impl_t *, void *);
-typedef uint64_t (*map_count_t)  (map_impl_t *);
-typedef void     (*map_print_t)  (map_impl_t *);
-typedef void     (*map_free_t)   (map_impl_t *);
+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) (map_impl_t *, void *);
-typedef uint64_t     (*map_iter_next_t)  (map_iter_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 {