generalize skiplist from a set to an updatable map

[nbds] / include / struct.h

diff --git a/include/struct.h b/include/struct.h
index bb5125a36b9cf7076dc9ff0b5c66f39b02c7143d..9d12f73f120dc3beb466d72411050dd7f3400b09 100644 (file)
--- a/include/struct.h
+++ b/include/struct.h
@@ -3,17 +3,30 @@
 
 #define DOES_NOT_EXIST 0
 
-#define HT_EXPECT_NOT_EXISTS ( 0)
-#define HT_EXPECT_EXISTS     (-1)
-#define HT_EXPECT_WHATEVER   (-2)
+#define EXPECT_DOES_NOT_EXIST ( 0)
+#define EXPECT_EXISTS         (-1)
+#define EXPECT_WHATEVER       (-2)
 
-typedef struct hash_table_i *hash_table_t;
+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_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_free   (hashtable_t *ht);
 
-hash_table_t *ht_alloc (void);
-void ht_free (hash_table_t *ht);
-uint64_t ht_get (hash_table_t *ht, const char *key, uint32_t len);
-uint64_t ht_compare_and_set (hash_table_t *ht, const char *key, uint32_t key_len, uint64_t expected_val, uint64_t val);
-uint64_t ht_remove (hash_table_t *ht, const char *key, uint32_t len);
-uint64_t ht_count (hash_table_t *ht);
+typedef struct ll list_t;
+list_t * ll_alloc  (void);
+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);
+
+typedef struct sl skiplist_t;
+skiplist_t * sl_alloc (void);
+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);
 
 #endif//STRUCT_H