X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=test%2Fmap_test1.c;h=1aa13d26a396bc6713be8bc889067c600cb35f9f;hb=8c48c212e119ba28b0666c9ec3faa97cbd11ca7a;hp=7c35b4592e9959acda072443a25135a13894032b;hpb=11572afcaf218cfcbb8e9747f22739f75252c4f4;p=nbds

diff --git a/test/map_test1.c b/test/map_test1.c
index 7c35b45..1aa13d2 100644
--- a/test/map_test1.c
+++ b/test/map_test1.c
@@ -7,10 +7,13 @@
 #include "nstring.h"
 #include "runtime.h"
 #include "map.h"
+#include "list.h"
+#include "skiplist.h"
+#include "hashtable.h"
 
-#define NUM_ITERATIONS 10000000
+#define NUM_ITERATIONS 1000000
 
-#define TEST_STRING_KEYS
+//#define TEST_STRING_KEYS
 
 static volatile int wait_;
 static long num_threads_;
@@ -39,9 +42,9 @@ void *worker (void *arg) {
         }
 #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
 
@@ -53,7 +56,7 @@ void *worker (void *arg) {
 
 int main (int argc, char **argv) {
     nbd_init();
-    lwt_set_trace_level("l3");
+    lwt_set_trace_level("r0m0l3");
 
     char* program_name = argv[0];
     pthread_t thread[MAX_NUM_THREADS];
@@ -82,7 +85,7 @@ 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], &DATATYPE_NSTRING);