X-Git-Url: https://pd.if.org/git/?p=nbds;a=blobdiff_plain;f=test%2Frcu_test.c;h=b2258554ad037684494509a3768df61581f73fb3;hp=96d196b37a9c71aba3c3d1b5c6b02095c70b0382;hb=HEAD;hpb=b21e1c182a2e469240d2b1cbbda37f2dfeb880d9

diff --git a/test/rcu_test.c b/test/rcu_test.c
index 96d196b..b225855 100644
--- a/test/rcu_test.c
+++ b/test/rcu_test.c
@@ -1,9 +1,12 @@
 #include <stdio.h>
 #include <errno.h>
 #include <pthread.h>
+#include <unistd.h>
+#include <sys/time.h>
 #include "common.h"
 #include "runtime.h"
 #include "mem.h"
+#include "rcu.h"
 
 #define NUM_ITERATIONS 10000000
 
@@ -27,18 +30,18 @@ static lifo_t *lifo_alloc (void) {
 static void lifo_aba_push (lifo_t *stk, node_t *x) {
     node_t *head;
     do {
-        head = ((volatile lifo_t *)stk)->head;
-        ((volatile node_t *)x)->next = head;
-    } while (__sync_val_compare_and_swap(&stk->head, head, x) != head);
+        head = VOLATILE_DEREF(stk).head;
+        VOLATILE_DEREF(x).next = head;
+    } while (SYNC_CAS(&stk->head, head, x) != head);
 }
 
 node_t *lifo_aba_pop (lifo_t *stk) {
     node_t *head;
     do {
-        head = ((volatile lifo_t *)stk)->head;
+        head = VOLATILE_DEREF(stk).head;
         if (head == NULL)
             return NULL;
-    } while (__sync_val_compare_and_swap(&stk->head, head, head->next) != head);
+    } while (SYNC_CAS(&stk->head, head, head->next) != head);
     head->next = NULL;
     return head;
 }
@@ -50,22 +53,21 @@ node_t *node_alloc (void) {
 }
 
 void *worker (void *arg) {
-    int id = (int)(size_t)arg;
-    unsigned int rand_seed = (unsigned int)id + 1;
+    nbd_thread_init();
 
     // Wait for all the worker threads to be ready.
-    __sync_fetch_and_add(&wait_, -1);
+    (void)__sync_fetch_and_add(&wait_, -1);
     do {} while (wait_); 
 
     int i;
     for (i = 0; i < NUM_ITERATIONS; ++ i) {
-        int n = rand_r(&rand_seed);
+        int n = nbd_rand();
         if (n & 0x1) {
             lifo_aba_push(stk_, node_alloc());
         } else {
             node_t *x = lifo_aba_pop(stk_);
             if (x) {
-                nbd_defer_free(x);
+                rcu_defer_free(x);
             }
         }
         rcu_update();
@@ -75,10 +77,10 @@ void *worker (void *arg) {
 }
 
 int main (int argc, char **argv) {
-    nbd_init();
-    //lwt_set_trace_level("m0r0");
+    nbd_thread_init();
+    lwt_set_trace_level("m3r3");
 
-    int num_threads = 2;
+    int num_threads = sysconf(_SC_NPROCESSORS_CONF);
     if (argc == 2)
     {
         errno = 0;
@@ -96,14 +98,23 @@ int main (int argc, char **argv) {
     stk_ = lifo_alloc();
     wait_ = num_threads;
 
+    struct timeval tv1, tv2;
+    gettimeofday(&tv1, NULL);
+    wait_ = num_threads;
+
     pthread_t thread[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; }
     }
     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;
+    printf("Th:%d Time:%dms\n\n", num_threads, ms);
+    fflush(stdout);
+
     return 0;
 }