port to Ubuntu 8.10 x86-64 w/ gcc 4.3.2

[nbds] / test / map_test1.c

diff --git a/test/map_test1.c b/test/map_test1.c
index 30d7ce0e4a7121d0e4349d33bf2417e8711a6b3c..3acf4c2a43cac981110d6e46ff684bf57589f92f 100644 (file)
--- a/test/map_test1.c
+++ b/test/map_test1.c
@@ -4,11 +4,18 @@
 #include <sys/time.h>
 
 #include "common.h"
+#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
+
 static volatile int wait_;
 static long num_threads_;
 static map_t *map_;
@@ -19,22 +26,26 @@ void *worker (void *arg) {
     SYNC_ADD(&wait_, -1);
     do {} while (wait_); 
 
+#ifdef TEST_STRING_KEYS
+    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;
-#if 1
-        char key_str[10];
-        sprintf(key_str, "%llX", key);
+        int key = r & 0xF;
+#ifdef TEST_STRING_KEYS
+        key_str->len = sprintf(key_str->data, "%X", key) + 1;
+        assert(key_str->len <= 10);
         if (r & (1 << 8)) {
-            map_set(map_, key_str, strlen(key_str) + 1, 1);
+            map_set(map_, (map_key_t)key_str, 1);
         } else {
-            map_remove(map_, key_str, strlen(key_str) + 1);
+            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
 
@@ -45,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];
@@ -75,9 +85,13 @@ 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) {
-        map_ = map_alloc(map_types[i]);
+#ifdef TEST_STRING_KEYS
+        map_ = map_alloc(map_types[i], &DATATYPE_NSTRING);
+#else
+        map_ = map_alloc(map_types[i], NULL);
+#endif
 
         struct timeval tv1, tv2;
         gettimeofday(&tv1, NULL);
@@ -96,7 +110,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_);
-        printf("Th:%ld Time:%dms\n", num_threads_, ms);
+        printf("Th:%ld Time:%dms\n\n", num_threads_, ms);
         fflush(stdout);
     }