add iterators to hashtable, skiplist, and list

[nbds] / include / skiplist.h

diff --git a/include/skiplist.h b/include/skiplist.h
index 11824f8f747cbb6c3e0e68cb8569c9a1539f5990..cf70656245da2efaf8b9b82d75837a61f037bcea 100644 (file)
--- a/include/skiplist.h
+++ b/include/skiplist.h
@@ -1,19 +1,28 @@
 #ifndef SKIPLIST_H
 #define SKIPLIST_H
 
-#include "datatype.h"
 #include "map.h"
 
 typedef struct sl skiplist_t;
-
-extern map_type_t MAP_TYPE_SKIPLIST;
+typedef struct sl_iter sl_iter_t;
 
 skiplist_t *sl_alloc (const datatype_t *key_type);
-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 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);
+void *   sl_min_key (skiplist_t *sl);
+
+sl_iter_t *sl_iter_start (skiplist_t *sl, void *key);
+sl_iter_t *sl_iter_next  (sl_iter_t *iter);
+uint64_t   sl_iter_val   (sl_iter_t *iter);
+void *     sl_iter_key   (sl_iter_t *iter);
+
+static const map_impl_t sl_map_impl = { 
+    (map_alloc_t)sl_alloc, (map_cas_t)sl_cas, (map_get_t)sl_lookup, (map_remove_t)sl_remove, 
+    (map_count_t)sl_count, (map_print_t)sl_print, (map_free_t)sl_free
+};
 
 #endif//SKIPLIST_H