X-Git-Url: https://pd.if.org/git/?p=nbds;a=blobdiff_plain;f=map%2Fmlocal.h;h=c422ec1c130e964b34900d08281b8e54d3d7be29;hp=1dae928ebba16191e396734ce7f842e760fbb244;hb=d26bac75802a324ed98c8d3d88cfb9eb87b3b35a;hpb=f1098084dd54496a61f9a254541190df77edd166

diff --git a/map/mlocal.h b/map/mlocal.h
index 1dae928..c422ec1 100644
--- a/map/mlocal.h
+++ b/map/mlocal.h
@@ -1,13 +1,13 @@
 #ifndef MLOCAL_H
 #define MLOCAL_H
 
-#include "map.h"
+#include "datatype.h"
 
 #define CAS_EXPECT_DOES_NOT_EXIST ( 0)
 #define CAS_EXPECT_EXISTS         (-1)
 #define CAS_EXPECT_WHATEVER       (-2)
 
-typedef void *   (*map_alloc_t)  (cmp_fun_t, hash_fun_t, clone_fun_t);
+typedef void *   (*map_alloc_t)  (const datatype_t *);
 typedef uint64_t (*map_cas_t)    (void *, void *, uint64_t, uint64_t);
 typedef uint64_t (*map_get_t)    (void *, void *);
 typedef uint64_t (*map_remove_t) (void *, void *);
@@ -25,33 +25,4 @@ typedef struct map_impl {
     map_free_t   free_;
 } map_impl_t;
 
-typedef struct ht hashtable_t;
-typedef struct sl skiplist_t;
-typedef struct ll list_t;
-
-hashtable_t * ht_alloc (cmp_fun_t cmp_fun, hash_fun_t hash_fun, clone_fun_t clone_fun);
-skiplist_t *  sl_alloc (cmp_fun_t cmp_fun, hash_fun_t hash_fun, clone_fun_t clone_fun);
-list_t *      ll_alloc (cmp_fun_t cmp_fun, hash_fun_t hash_fun, clone_fun_t clone_fun);
-
-uint64_t ht_cas    (hashtable_t *ht, void *key, uint64_t expected_val, uint64_t val);
-uint64_t ht_get    (hashtable_t *ht, void *key);
-uint64_t ht_remove (hashtable_t *ht, void *key);
-uint64_t ht_count  (hashtable_t *ht);
-void     ht_print  (hashtable_t *ht);
-void     ht_free   (hashtable_t *ht);
-
-uint64_t sl_cas    (skiplist_t *sl, void *key, uint64_t expected_val, uint64_t new_val);
-uint64_t sl_lookup (skiplist_t *sl, void *key);
-uint64_t sl_remove (skiplist_t *sl, void *key);
-uint64_t sl_count  (skiplist_t *sl);
-void     sl_print  (skiplist_t *sl);
-void     sl_free   (skiplist_t *sl);
-
-uint64_t ll_cas    (list_t *ll, void *key, uint64_t expected_val, uint64_t new_val);
-uint64_t ll_lookup (list_t *ll, void *key);
-uint64_t ll_remove (list_t *ll, void *key);
-uint64_t ll_count  (list_t *ll);
-void     ll_print  (list_t *ll);
-void     ll_free   (list_t *ll);
-
 #endif//MLOCAL_H