generic interface for map-like data structures

[nbds] / map / mlocal.h

diff --git a/include/struct.h b/map/mlocal.h
similarity index 75%
rename from include/struct.h
rename to map/mlocal.h
index 9d12f73f120dc3beb466d72411050dd7f3400b09..548a49fdaa05ac918be10397ba1eb132f4babb31 100644 (file)
--- a/include/struct.h
+++ b/map/mlocal.h
@@ -1,18 +1,17 @@
 #ifndef STRUCT_H
 #define STRUCT_H
 
-#define DOES_NOT_EXIST 0
-
-#define EXPECT_DOES_NOT_EXIST ( 0)
-#define EXPECT_EXISTS         (-1)
-#define EXPECT_WHATEVER       (-2)
+#define CAS_EXPECT_DOES_NOT_EXIST ( 0)
+#define CAS_EXPECT_EXISTS         (-1)
+#define CAS_EXPECT_WHATEVER       (-2)
 
 typedef struct ht hashtable_t;
 hashtable_t *ht_alloc (void);
-uint64_t ht_compare_and_set (hashtable_t *ht, const char *key, uint32_t key_len, uint64_t expected_val, uint64_t val);
+uint64_t ht_cas    (hashtable_t *ht, const char *key, uint32_t key_len, uint64_t expected_val, uint64_t val);
 uint64_t ht_get    (hashtable_t *ht, const char *key, uint32_t len);
 uint64_t ht_remove (hashtable_t *ht, const char *key, uint32_t len);
 uint64_t ht_count  (hashtable_t *ht);
+void     ht_print  (hashtable_t *ht);
 void     ht_free   (hashtable_t *ht);
 
 typedef struct ll list_t;
@@ -21,6 +20,7 @@ uint64_t ll_lookup (list_t *ll, const void *key_data, uint32_t key_len);
 uint64_t ll_cas    (list_t *ll, const void *key_data, uint32_t key_len, uint64_t expected_val, uint64_t new_val);
 uint64_t ll_remove (list_t *ll, const void *key_data, uint32_t key_len);
 void     ll_print  (list_t *ll);
+void     ll_free   (list_t *ll);
 
 typedef struct sl skiplist_t;
 skiplist_t * sl_alloc (void);
@@ -28,5 +28,7 @@ uint64_t sl_lookup (skiplist_t *sl, const void *key_data, uint32_t key_len);
 uint64_t sl_cas    (skiplist_t *sl, const void *key_data, uint32_t key_len, uint64_t expected_val, uint64_t new_val);
 uint64_t sl_remove (skiplist_t *sl, const void *key_data, uint32_t key_len);
 void     sl_print  (skiplist_t *sl);
+void     sl_free   (list_t *sl);
+
 
 #endif//STRUCT_H