generalize skiplist from a set to an updatable map

[nbds] / include / struct.h

diff --git a/include/struct.h b/include/struct.h
index 3dec0fac440c253b54e331e0cb4cc3ea23580119..9d12f73f120dc3beb466d72411050dd7f3400b09 100644 (file)
--- a/include/struct.h
+++ b/include/struct.h
@@ -7,29 +7,26 @@
 #define EXPECT_EXISTS         (-1)
 #define EXPECT_WHATEVER       (-2)
 
-typedef struct hti *hashtable_t;
+typedef struct ht hashtable_t;
 hashtable_t *ht_alloc (void);
-void ht_free (hashtable_t *ht);
-
 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);
 
 typedef struct ll list_t;
-list_t * ll_alloc (void);
-
-uint64_t ll_lookup (list_t *ll, uint64_t key);
-uint64_t ll_add    (list_t *ll, uint64_t key, uint64_t value);
-uint64_t ll_remove (list_t *ll, uint64_t key);
+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, uint64_t key);
-uint64_t sl_add    (skiplist_t *sl, uint64_t key, uint64_t value);
-uint64_t sl_remove (skiplist_t *sl, uint64_t key);
+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