cds containers: lfqueue and lfstack: don't depend on a particular rcu flavor

[urcu.git] / tests / test_urcu_lfs.c

diff --git a/tests/test_urcu_lfs.c b/tests/test_urcu_lfs.c
index 02be2d4d61a75e7248e4d80f79df6066f65e76db..71596fdb3071b77123eb64c4069401ae77a96b01 100644 (file)
--- a/tests/test_urcu_lfs.c
+++ b/tests/test_urcu_lfs.c
@@ -154,7 +154,7 @@ static unsigned long long __thread nr_successful_enqueues;
 static unsigned int nr_enqueuers;
 static unsigned int nr_dequeuers;
 
-static struct rcu_lfs_stack s;
+static struct cds_lfs_stack_rcu s;
 
 void *thr_enqueuer(void *_count)
 {
@@ -173,11 +173,12 @@ void *thr_enqueuer(void *_count)
        cmm_smp_mb();
 
        for (;;) {
-               struct rcu_lfs_node *node = malloc(sizeof(*node));
+               struct cds_lfs_node_rcu *node = malloc(sizeof(*node));
                if (!node)
                        goto fail;
-               rcu_lfs_node_init(node);
-               rcu_lfs_push(&s, node);
+               cds_lfs_node_init_rcu(node);
+               /* No rcu read-side is needed for push */
+               cds_lfs_push_rcu(&s, node);
                nr_successful_enqueues++;
 
                if (unlikely(wdelay))
@@ -203,13 +204,18 @@ fail:
 void *thr_dequeuer(void *_count)
 {
        unsigned long long *count = _count;
+       int ret;
 
        printf_verbose("thread_begin %s, thread id : %lx, tid %lu\n",
                        "dequeuer", pthread_self(), (unsigned long)gettid());
 
        set_affinity();
 
-       rcu_defer_register_thread();
+       ret = rcu_defer_register_thread();
+       if (ret) {
+               printf("Error in rcu_defer_register_thread\n");
+               exit(-1);
+       }
        rcu_register_thread();
 
        while (!test_go)
@@ -218,13 +224,15 @@ void *thr_dequeuer(void *_count)
        cmm_smp_mb();
 
        for (;;) {
-               struct rcu_lfs_node *node = rcu_lfs_pop(&s);
+               struct cds_lfs_node_rcu *node;
 
+               rcu_read_lock();
+               node = cds_lfs_pop_rcu(&s);
+               rcu_read_unlock();
                if (node) {
                        defer_rcu(free, node);
                        nr_successful_dequeues++;
                }
-
                nr_dequeues++;
                if (unlikely(!test_duration_dequeue()))
                        break;
@@ -244,12 +252,12 @@ void *thr_dequeuer(void *_count)
        return ((void*)2);
 }
 
-void test_end(struct rcu_lfs_stack *s, unsigned long long *nr_dequeues)
+void test_end(struct cds_lfs_stack_rcu *s, unsigned long long *nr_dequeues)
 {
-       struct rcu_lfs_node *node;
+       struct cds_lfs_node_rcu *node;
 
        do {
-               node = rcu_lfs_pop(s);
+               node = cds_lfs_pop_rcu(s);
                if (node) {
                        free(node);
                        (*nr_dequeues)++;
@@ -348,7 +356,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_lfs_init(&s);
+       cds_lfs_init_rcu(&s);
 
        next_aff = 0;