#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 *);
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