X-Git-Url: https://pd.if.org/git/?p=nbds;a=blobdiff_plain;f=test%2Fmap_test1.c;h=f05fa3dea001871492aeb8e75ba166c221c11037;hp=1aa13d26a396bc6713be8bc889067c600cb35f9f;hb=778b8c8ca708b082a1192acfb114a6751b2ad7c9;hpb=2cce67f0002cdb6dcdc2ab8ccf837e3d2b3336de

diff --git a/test/map_test1.c b/test/map_test1.c
index 1aa13d2..f05fa3d 100644
--- a/test/map_test1.c
+++ b/test/map_test1.c
@@ -7,11 +7,12 @@
 #include "nstring.h"
 #include "runtime.h"
 #include "map.h"
+#include "rcu.h"
 #include "list.h"
 #include "skiplist.h"
 #include "hashtable.h"
 
-#define NUM_ITERATIONS 1000000
+#define NUM_ITERATIONS 10000000
 
 //#define TEST_STRING_KEYS
 
@@ -22,23 +23,23 @@ static map_t *map_;
 void *worker (void *arg) {
 
     // 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)) {
@@ -55,8 +56,7 @@ void *worker (void *arg) {
 }
 
 int main (int argc, char **argv) {
-    nbd_init();
-    lwt_set_trace_level("r0m0l3");
+    lwt_set_trace_level("r0m3s3");
 
     char* program_name = argv[0];
     pthread_t thread[MAX_NUM_THREADS];
@@ -66,7 +66,7 @@ int main (int argc, char **argv) {
         return -1;
     }
 
-    num_threads_ = 2;
+    num_threads_ = MAX_NUM_THREADS;
     if (argc == 2)
     {
         errno = 0;
@@ -85,7 +85,7 @@ int main (int argc, char **argv) {
         }
     }
 
-    static const map_impl_t *map_types[] = { &ll_map_impl, &sl_map_impl, &ht_map_impl };
+    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);