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

diff --git a/test/map_test1.c b/test/map_test1.c
index 7c35b45..11fa5d4 100644
--- a/test/map_test1.c
+++ b/test/map_test1.c
@@ -7,41 +7,46 @@
 #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
 
-#define TEST_STRING_KEYS
+//#define TEST_STRING_KEYS
 
 static volatile int wait_;
 static long num_threads_;
 static map_t *map_;
 
 void *worker (void *arg) {
+    nbd_thread_init();
 
     // Wait for all the worker threads to be ready.
-    SYNC_ADD(&wait_, -1);
+    (void)SYNC_ADD(&wait_, -1);
     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 +57,8 @@ void *worker (void *arg) {
 }
 
 int main (int argc, char **argv) {
-    nbd_init();
-    lwt_set_trace_level("l3");
+    nbd_thread_init();
+    lwt_set_trace_level("r0m3s3");
 
     char* program_name = argv[0];
     pthread_t thread[MAX_NUM_THREADS];
@@ -63,7 +68,7 @@ int main (int argc, char **argv) {
         return -1;
     }
 
-    num_threads_ = 2;
+    num_threads_ = MAX_NUM_THREADS;
     if (argc == 2)
     {
         errno = 0;
@@ -82,7 +87,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[] = { &MAP_IMPL_LL, &MAP_IMPL_SL, &MAP_IMPL_HT };
     for (int i = 0; i < sizeof(map_types)/sizeof(*map_types); ++i) {
 #ifdef TEST_STRING_KEYS
         map_ = map_alloc(map_types[i], &DATATYPE_NSTRING);
@@ -96,7 +101,7 @@ int main (int argc, char **argv) {
         wait_ = num_threads_;
 
         for (int i = 0; i < num_threads_; ++i) {
-            int rc = nbd_thread_create(thread + i, i, worker, (void*)(size_t)i);
+            int rc = pthread_create(thread + i, NULL, worker, (void*)(size_t)i);
             if (rc != 0) { perror("pthread_create"); return rc; }
         }
 
@@ -106,7 +111,7 @@ int main (int argc, char **argv) {
 
         gettimeofday(&tv2, NULL);
         int ms = (int)(1000000*(tv2.tv_sec - tv1.tv_sec) + tv2.tv_usec - tv1.tv_usec) / 1000;
-        map_print(map_);
+        map_print(map_, FALSE);
         printf("Th:%ld Time:%dms\n\n", num_threads_, ms);
         fflush(stdout);
     }