X-Git-Url: https://pd.if.org/git/?p=nbds;a=blobdiff_plain;f=map%2Fmap.c;h=6305c4502e20c13d6ff921e818d397271df175c7;hp=a8a7068c6e88f3e208dc758b250a624d2f849447;hb=HEAD;hpb=5ae34506293996af2af43b1da4f1130dd711ccbe

diff --git a/map/map.c b/map/map.c
index a8a7068..6305c45 100644
--- a/map/map.c
+++ b/map/map.c
@@ -1,4 +1,4 @@
-/* 
+/*
  * Written by Josh Dybnis and released to the public domain, as explained at
  * http://creativecommons.org/licenses/publicdomain
  *
@@ -6,107 +6,74 @@
  */
 
 #include "common.h"
-#include "mlocal.h"
-#include "mem.h"
 #include "map.h"
+#include "mem.h"
 
 struct map {
-    map_type_e type;
-    void *impl;
+    const map_impl_t *impl;
+    void *data;
 };
 
-map_t *map_alloc (map_type_e map_type) {
-    void *impl = NULL;
-    switch (map_type) {
-        case MAP_TYPE_HASHTABLE: impl = ht_alloc(); break;
-        case MAP_TYPE_SKIPLIST:  impl = sl_alloc(); break;
-        case MAP_TYPE_LIST:      impl = ll_alloc(); break;
-    }
-    map_t *map = NULL;
-    if (impl) {
-        map = nbd_malloc(sizeof(map_t));
-        map->type = map_type;
-        map->impl = impl;
-    }
+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);
     return map;
 }
 
 void map_free (map_t *map) {
-    switch (map->type) {
-        case MAP_TYPE_HASHTABLE: ht_free(map->impl); break;
-        case MAP_TYPE_SKIPLIST:  sl_free(map->impl); break;
-        case MAP_TYPE_LIST:      ll_free(map->impl); break;
-    }
+    map->impl->free_(map->data);
+}
+
+void map_print (map_t *map, int verbose) {
+    map->impl->print(map->data, verbose);
+}
+
+map_val_t map_count (map_t *map) {
+    return map->impl->count(map->data);
+}
+
+map_val_t map_get (map_t *map, map_key_t key) {
+    return map->impl->get(map->data, key);
 }
 
-void map_print (map_t *map) {
-    switch (map->type) {
-        case MAP_TYPE_HASHTABLE: ht_print(map->impl); break;
-        case MAP_TYPE_SKIPLIST:  sl_print(map->impl); break;
-        case MAP_TYPE_LIST:      ll_print(map->impl); break;
-    }
+map_val_t map_set (map_t *map, map_key_t key, map_val_t new_val) {
+    return map->impl->cas(map->data, key, CAS_EXPECT_WHATEVER, new_val);
 }
 
-uint64_t map_stat (map_t *map, map_stat_e stat_type) {
-    switch (stat_type) {
-        case MAP_STAT_COUNT: 
-            if (map->type != MAP_TYPE_HASHTABLE)
-                return ERROR_UNSUPPORTED_FEATURE;
-            return ht_count(map->impl);
-    }
-    return ERROR_INVALID_OPTION;
+map_val_t map_add (map_t *map, map_key_t key, map_val_t new_val) {
+    return map->impl->cas(map->data, key, CAS_EXPECT_DOES_NOT_EXIST, new_val);
 }
 
-uint64_t map_get (map_t *map, const void *key_data, uint32_t key_len) {
-    switch (map->type) {
-        case MAP_TYPE_HASHTABLE: return ht_get(map->impl, key_data, key_len);
-        case MAP_TYPE_SKIPLIST:  return sl_lookup(map->impl, key_data, key_len);
-        case MAP_TYPE_LIST:      return ll_lookup(map->impl, key_data, key_len);
-    }
-    return ERROR_INVALID_ARGUMENT;
+map_val_t map_cas (map_t *map, map_key_t key, map_val_t expected_val, map_val_t new_val) {
+    return map->impl->cas(map->data, key, expected_val, new_val);
 }
 
-uint64_t map_set (map_t *map, const void *key_data, uint32_t key_len, uint64_t new_val) {
-    switch (map->type) {
-        case MAP_TYPE_HASHTABLE: return ht_cas(map->impl, key_data, key_len, CAS_EXPECT_WHATEVER, new_val);
-        case MAP_TYPE_SKIPLIST:  return sl_cas(map->impl, key_data, key_len, CAS_EXPECT_WHATEVER, new_val);
-        case MAP_TYPE_LIST:      return ll_cas(map->impl, key_data, key_len, CAS_EXPECT_WHATEVER, new_val);
-    }
-    return ERROR_INVALID_ARGUMENT;
+map_val_t map_replace(map_t *map, map_key_t key, map_val_t new_val) {
+    return map->impl->cas(map->data, key, CAS_EXPECT_EXISTS, new_val);
 }
 
-uint64_t map_add (map_t *map, const void *key_data, uint32_t key_len, uint64_t new_val) {
-    switch (map->type) {
-        case MAP_TYPE_HASHTABLE: return ht_cas(map->impl, key_data, key_len, CAS_EXPECT_DOES_NOT_EXIST, new_val);
-        case MAP_TYPE_SKIPLIST:  return sl_cas(map->impl, key_data, key_len, CAS_EXPECT_DOES_NOT_EXIST, new_val);
-        case MAP_TYPE_LIST:      return ll_cas(map->impl, key_data, key_len, CAS_EXPECT_DOES_NOT_EXIST, new_val);
-    }
-    return ERROR_INVALID_ARGUMENT;
+map_val_t map_remove (map_t *map, map_key_t key) {
+    return map->impl->remove(map->data, key);
 }
 
-uint64_t map_cas (map_t *map, const void *key_data, uint32_t key_len, uint64_t expected_val, uint64_t new_val) {
-    switch (map->type) {
-        case MAP_TYPE_HASHTABLE: return ht_cas(map->impl, key_data, key_len, expected_val, new_val);
-        case MAP_TYPE_SKIPLIST:  return sl_cas(map->impl, key_data, key_len, expected_val, new_val);
-        case MAP_TYPE_LIST:      return ll_cas(map->impl, key_data, key_len, expected_val, new_val);
-    }
-    return ERROR_INVALID_ARGUMENT;
+map_iter_t * map_iter_begin (map_t *map, map_key_t 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_replace(map_t *map, const void *key_data, uint32_t key_len, uint64_t new_val) {
-    switch (map->type) {
-        case MAP_TYPE_HASHTABLE: return ht_cas(map->impl, key_data, key_len, CAS_EXPECT_EXISTS, new_val);
-        case MAP_TYPE_SKIPLIST:  return sl_cas(map->impl, key_data, key_len, CAS_EXPECT_EXISTS, new_val);
-        case MAP_TYPE_LIST:      return ll_cas(map->impl, key_data, key_len, CAS_EXPECT_EXISTS, new_val);
-    }
-    return ERROR_INVALID_ARGUMENT;
+map_val_t map_iter_next (map_iter_t *iter, map_key_t *key_ptr) {
+    return iter->impl->iter_next(iter->state, key_ptr);
 }
 
-uint64_t map_remove (map_t *map, const void *key_data, uint32_t key_len) {
-    switch (map->type) {
-        case MAP_TYPE_HASHTABLE: return ht_remove(map->impl, key_data, key_len);
-        case MAP_TYPE_SKIPLIST:  return sl_remove(map->impl, key_data, key_len);
-        case MAP_TYPE_LIST:      return ll_remove(map->impl, key_data, key_len);
-    }
-    return ERROR_INVALID_ARGUMENT;
+void map_iter_free (map_iter_t *iter) {
+    iter->impl->iter_free(iter->state);
+    nbd_free(iter);
 }