Rename all data structure with prefix cds_

[urcu.git] / tests / test_urcu_wfs.c

diff --git a/tests/test_urcu_wfs.c b/tests/test_urcu_wfs.c
index 4802ee73d7745a73340fa2767f295d605fb10eca..dc4570009d790ad21e5ec4bde373a2639c380384 100644 (file)
--- a/tests/test_urcu_wfs.c
+++ b/tests/test_urcu_wfs.c
@@ -62,8 +62,7 @@ static inline pid_t gettid(void)
 #define _LGPL_SOURCE
 #endif
 #include <urcu.h>
-#include <urcu/rcuwfstack.h>
-#include <urcu-defer.h>
+#include <urcu/wfstack.h>
 
 static volatile int test_go, test_stop;
 
@@ -77,7 +76,7 @@ static unsigned long wdelay;
 static inline void loop_sleep(unsigned long l)
 {
        while(l-- != 0)
-               cpu_relax();
+               caa_cpu_relax();
 }
 
 static int verbose_mode;
@@ -154,7 +153,7 @@ static unsigned long long __thread nr_successful_enqueues;
 static unsigned int nr_enqueuers;
 static unsigned int nr_dequeuers;
 
-static struct rcu_wfs_stack s;
+static struct cds_wfs_stack s;
 
 void *thr_enqueuer(void *_count)
 {
@@ -165,19 +164,17 @@ void *thr_enqueuer(void *_count)
 
        set_affinity();
 
-       rcu_register_thread();
-
        while (!test_go)
        {
        }
-       smp_mb();
+       cmm_smp_mb();
 
        for (;;) {
-               struct rcu_wfs_node *node = malloc(sizeof(*node));
+               struct cds_wfs_node *node = malloc(sizeof(*node));
                if (!node)
                        goto fail;
-               rcu_wfs_node_init(node);
-               rcu_wfs_push(&s, node);
+               cds_wfs_node_init(node);
+               cds_wfs_push(&s, node);
                nr_successful_enqueues++;
 
                if (unlikely(wdelay))
@@ -188,8 +185,6 @@ fail:
                        break;
        }
 
-       rcu_unregister_thread();
-
        count[0] = nr_enqueues;
        count[1] = nr_successful_enqueues;
        printf_verbose("enqueuer thread_end, thread id : %lx, tid %lu, "
@@ -209,19 +204,16 @@ void *thr_dequeuer(void *_count)
 
        set_affinity();
 
-       rcu_defer_register_thread();
-       rcu_register_thread();
-
        while (!test_go)
        {
        }
-       smp_mb();
+       cmm_smp_mb();
 
        for (;;) {
-               struct rcu_wfs_node *node = rcu_wfs_pop(&s);
+               struct cds_wfs_node *node = cds_wfs_pop_blocking(&s);
 
                if (node) {
-                       defer_rcu(free, node);
+                       free(node);
                        nr_successful_dequeues++;
                }
 
@@ -232,9 +224,6 @@ void *thr_dequeuer(void *_count)
                        loop_sleep(rduration);
        }
 
-       rcu_unregister_thread();
-       rcu_defer_unregister_thread();
-
        printf_verbose("dequeuer thread_end, thread id : %lx, tid %lu, "
                       "dequeues %llu, successful_dequeues %llu\n",
                       pthread_self(), (unsigned long)gettid(), nr_dequeues,
@@ -244,12 +233,12 @@ void *thr_dequeuer(void *_count)
        return ((void*)2);
 }
 
-void test_end(struct rcu_wfs_stack *s, unsigned long long *nr_dequeues)
+void test_end(struct cds_wfs_stack *s, unsigned long long *nr_dequeues)
 {
-       struct rcu_wfs_node *node;
+       struct cds_wfs_node *node;
 
        do {
-               node = rcu_wfs_pop(s);
+               node = cds_wfs_pop_blocking(s);
                if (node) {
                        free(node);
                        (*nr_dequeues)++;
@@ -348,7 +337,7 @@ int main(int argc, char **argv)
        tid_dequeuer = malloc(sizeof(*tid_dequeuer) * nr_dequeuers);
        count_enqueuer = malloc(2 * sizeof(*count_enqueuer) * nr_enqueuers);
        count_dequeuer = malloc(2 * sizeof(*count_dequeuer) * nr_dequeuers);
-       rcu_wfs_init(&s);
+       cds_wfs_init(&s);
 
        next_aff = 0;
 
@@ -365,7 +354,7 @@ int main(int argc, char **argv)
                        exit(1);
        }
 
-       smp_mb();
+       cmm_smp_mb();
 
        test_go = 1;