use generic map interface in tests

[nbds] / test / map_test1.c

diff --git a/test/ll_test.c b/test/map_test1.c
similarity index 69%
rename from test/ll_test.c
rename to test/map_test1.c
index 490bf7d1393afec8e115a6721d50fdce0f554fda..30d7ce0e4a7121d0e4349d33bf2417e8711a6b3c 100644 (file)
--- a/test/ll_test.c
+++ b/test/map_test1.c
@@ -75,26 +75,30 @@ int main (int argc, char **argv) {
         }
     }
 
-    map_ = map_alloc(MAP_TYPE_LIST);
+    map_type_t map_types[] = { MAP_TYPE_LIST, MAP_TYPE_SKIPLIST, MAP_TYPE_HASHTABLE };
+    for (int i = 0; i < sizeof(map_types)/sizeof(*map_types); ++i) {
+        map_ = map_alloc(map_types[i]);
 
-    struct timeval tv1, tv2;
-    gettimeofday(&tv1, NULL);
+        struct timeval tv1, tv2;
+        gettimeofday(&tv1, NULL);
 
-    wait_ = num_threads_;
+        wait_ = num_threads_;
 
-    for (int i = 0; i < num_threads_; ++i) {
-        int rc = nbd_thread_create(thread + i, i, worker, (void*)(size_t)i);
-        if (rc != 0) { perror("pthread_create"); return rc; }
-    }
+        for (int i = 0; i < num_threads_; ++i) {
+            int rc = nbd_thread_create(thread + i, i, worker, (void*)(size_t)i);
+            if (rc != 0) { perror("pthread_create"); return rc; }
+        }
 
-    for (int i = 0; i < num_threads_; ++i) {
-        pthread_join(thread[i], NULL);
-    }
+        for (int i = 0; i < num_threads_; ++i) {
+            pthread_join(thread[i], NULL);
+        }
 
-    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);
+        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);
+        fflush(stdout);
+    }
 
     return 0;
 }