generic map iterator interface

[nbds] / map / map.c

diff --git a/map/map.c b/map/map.c
index 6602a9be05fe7e1983307367453cd7b28dc598e7..fcd9f830c438240568543865a96f3ac0f9fc2f77 100644 (file)
--- a/map/map.c
+++ b/map/map.c
@@ -6,17 +6,20 @@
  */
 
 #include "common.h"
-#include "mlocal.h"
-#include "mem.h"
 #include "map.h"
+#include "mem.h"
 
 struct map {
     const map_impl_t *impl;
     void *data;
 };
 
-map_t *map_alloc (map_type_t map_type, const datatype_t *key_type) { 
-    const map_impl_t *map_impl = map_type;
+struct map_iter {
+    const map_impl_t *impl;
+    void *state;
+};
+
+map_t *map_alloc (const map_impl_t *map_impl, const datatype_t *key_type) { 
     map_t *map = nbd_malloc(sizeof(map_t)); 
     map->impl  = map_impl;
     map->data  = map->impl->alloc(key_type);
@@ -58,3 +61,19 @@ uint64_t map_replace(map_t *map, void *key, uint64_t new_val) {
 uint64_t map_remove (map_t *map, void *key) {
     return map->impl->remove(map->data, key);
 }
+
+map_iter_t * map_iter_begin (map_t *map, void *key) {
+    map_iter_t *iter = nbd_malloc(sizeof(map_iter_t));
+    iter->impl  = map->impl;
+    iter->state = map->impl->iter_begin(map->data, key);
+    return iter;
+}
+
+uint64_t map_iter_next (map_iter_t *iter, void **key_ptr) {
+    return iter->impl->iter_next(iter->state, key_ptr);
+}
+
+void map_iter_free (map_iter_t *iter) {
+    iter->impl->iter_free(iter->state);
+    nbd_free(iter);
+}