X-Git-Url: https://pd.if.org/git/?p=nbds;a=blobdiff_plain;f=include%2Fhashtable.h;h=d9001d4ab6e3e99a9b8a8bdc20aea295fc69d212;hp=5ae84c11db2d670df7c44523cbf02bf2b391ee97;hb=86fd9c8abfbacea2902b4fe42a8a4664b2a531cf;hpb=f3a053a46bbb4ba460bcff0920b93dfc8263e02e

diff --git a/include/hashtable.h b/include/hashtable.h
index 5ae84c1..d9001d4 100644
--- a/include/hashtable.h
+++ b/include/hashtable.h
@@ -6,23 +6,21 @@
 typedef struct ht hashtable_t;
 typedef struct ht_iter ht_iter_t;
 
-hashtable_t *ht_alloc (const datatype_t *key_type);
-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);
+hashtable_t * ht_alloc      (const datatype_t *key_type);
+map_val_t     ht_cas        (hashtable_t *ht, map_key_t key, map_val_t expected_val, map_val_t val);
+map_val_t     ht_get        (hashtable_t *ht, map_key_t key);
+map_val_t     ht_remove     (hashtable_t *ht, map_key_t key);
+size_t        ht_count      (hashtable_t *ht);
+void          ht_print      (hashtable_t *ht, int verbose);
+void          ht_free       (hashtable_t *ht);
+ht_iter_t *   ht_iter_begin (hashtable_t *ht, map_key_t key);
+map_val_t     ht_iter_next  (ht_iter_t *iter, map_key_t *key_ptr);
+void          ht_iter_free  (ht_iter_t *iter);
 
-ht_iter_t *ht_iter_start (hashtable_t *ht, void *key);
-ht_iter_t *ht_iter_next  (ht_iter_t *iter);
-uint64_t   ht_iter_val   (ht_iter_t *iter);
-uint64_t   ht_iter_key   (ht_iter_t *iter);
-void       ht_iter_free  (ht_iter_t *iter);
-
-static const map_impl_t ht_map_impl = { 
+static const map_impl_t MAP_IMPL_HT = { 
     (map_alloc_t)ht_alloc, (map_cas_t)ht_cas, (map_get_t)ht_get, (map_remove_t)ht_remove, 
-    (map_count_t)ht_count, (map_print_t)ht_print, (map_free_t)ht_free
+    (map_count_t)ht_count, (map_print_t)ht_print, (map_free_t)ht_free,
+    (map_iter_begin_t)ht_iter_begin, (map_iter_next_t)ht_iter_next, (map_iter_free_t)ht_iter_free
 };
 
 #endif//HASHTABLE_H