X-Git-Url: https://pd.if.org/git/?p=nbds;a=blobdiff_plain;f=test%2Fmap_test1.c;h=3acf4c2a43cac981110d6e46ff684bf57589f92f;hp=34d4ba74f17bb3aed31b00a089a2c6ddd546fa99;hb=2b107655a1df8ae7703b44ef8cf1430a7250a5c3;hpb=f1098084dd54496a61f9a254541190df77edd166

diff --git a/test/map_test1.c b/test/map_test1.c
index 34d4ba7..3acf4c2 100644
--- a/test/map_test1.c
+++ b/test/map_test1.c
@@ -7,6 +7,10 @@
 #include "nstring.h"
 #include "runtime.h"
 #include "map.h"
+#include "rcu.h"
+#include "list.h"
+#include "skiplist.h"
+#include "hashtable.h"
 
 #define NUM_ITERATIONS 10000000
 
@@ -23,25 +27,25 @@ void *worker (void *arg) {
     do {} while (wait_); 
 
 #ifdef TEST_STRING_KEYS
-        nstring_t *key_str = ns_alloc(10);
+    nstring_t *key_str = ns_alloc(10);
 #endif
 
     for (int i = 0; i < NUM_ITERATIONS/num_threads_; ++i) {
         unsigned r = nbd_rand();
-        uint64_t key = r & 0xF;
+        int key = r & 0xF;
 #ifdef TEST_STRING_KEYS
-        key_str->len = sprintf(key_str->data, "%llX", key) + 1;
+        key_str->len = sprintf(key_str->data, "%X", key) + 1;
         assert(key_str->len <= 10);
         if (r & (1 << 8)) {
-            map_set(map_, key_str, 1);
+            map_set(map_, (map_key_t)key_str, 1);
         } else {
-            map_remove(map_, key_str);
+            map_remove(map_, (map_key_t)key_str);
         }
 #else
         if (r & (1 << 8)) {
-            map_set(map_, (void *)(key + 1), 1);
+            map_set(map_, (map_key_t)(key + 1), 1);
         } else {
-            map_remove(map_, (void *)(key + 1));
+            map_remove(map_, (map_key_t)(key + 1));
         }
 #endif
 
@@ -52,8 +56,7 @@ void *worker (void *arg) {
 }
 
 int main (int argc, char **argv) {
-    nbd_init();
-    lwt_set_trace_level("l3");
+    lwt_set_trace_level("r0m3s3");
 
     char* program_name = argv[0];
     pthread_t thread[MAX_NUM_THREADS];
@@ -82,12 +85,12 @@ int main (int argc, char **argv) {
         }
     }
 
-    map_type_t map_types[] = { MAP_TYPE_LIST, MAP_TYPE_SKIPLIST, MAP_TYPE_HASHTABLE };
+    static const map_impl_t *map_types[] = { &ll_map_impl, &sl_map_impl, &ht_map_impl };
     for (int i = 0; i < sizeof(map_types)/sizeof(*map_types); ++i) {
 #ifdef TEST_STRING_KEYS
-        map_ = map_alloc(map_types[i], (cmp_fun_t)ns_cmp, (hash_fun_t)ns_hash, (clone_fun_t)ns_dup);
+        map_ = map_alloc(map_types[i], &DATATYPE_NSTRING);
 #else
-        map_ = map_alloc(map_types[i], NULL, NULL, NULL);
+        map_ = map_alloc(map_types[i], NULL);
 #endif
 
         struct timeval tv1, tv2;