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

[urcu.git] / tests / test_urcu_lfq.c

diff --git a/tests/test_urcu_lfq.c b/tests/test_urcu_lfq.c
index 87c53b6c25460b89b1837dddf5cfe3ce1fa80471..15023f6fcb0011f1e8db81dcf925a06fed32dc96 100644 (file)
--- a/tests/test_urcu_lfq.c
+++ b/tests/test_urcu_lfq.c
@@ -77,7 +77,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 +154,7 @@ static unsigned long long __thread nr_successful_enqueues;
 static unsigned int nr_enqueuers;
 static unsigned int nr_dequeuers;
 
-static struct rcu_lfq_queue q;
+static struct cds_lfq_queue_rcu q;
 
 void *thr_enqueuer(void *_count)
 {
@@ -170,14 +170,16 @@ void *thr_enqueuer(void *_count)
        while (!test_go)
        {
        }
-       smp_mb();
+       cmm_smp_mb();
 
        for (;;) {
-               struct rcu_lfq_node *node = malloc(sizeof(*node));
+               struct cds_lfq_node_rcu *node = malloc(sizeof(*node));
                if (!node)
                        goto fail;
-               rcu_lfq_node_init(node);
-               rcu_lfq_enqueue(&q, node);
+               cds_lfq_node_init_rcu(node);
+               rcu_read_lock();
+               cds_lfq_enqueue_rcu(&q, node);
+               rcu_read_unlock();
                nr_successful_enqueues++;
 
                if (unlikely(wdelay))
@@ -200,37 +202,51 @@ fail:
 
 }
 
-static void rcu_release_node(struct urcu_ref *ref)
+static void rcu_free_node(struct rcu_head *head)
 {
-       struct rcu_lfq_node *node = container_of(ref, struct rcu_lfq_node, ref);
-       defer_rcu(free, node);
-       //synchronize_rcu();
-       //free(node);
+       struct cds_lfq_node_rcu *node =
+               caa_container_of(head, struct cds_lfq_node_rcu, rcu_head);
+       free(node);
+}
+
+static void ref_release_node(struct urcu_ref *ref)
+{
+       struct cds_lfq_node_rcu *node =
+               caa_container_of(ref, struct cds_lfq_node_rcu, ref);
+       call_rcu(&node->rcu_head, rcu_free_node);
 }
 
 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)
        {
        }
-       smp_mb();
+       cmm_smp_mb();
 
        for (;;) {
-               struct rcu_lfq_node *node = rcu_lfq_dequeue(&q,
-                                                           rcu_release_node);
+               struct cds_lfq_node_rcu *node;
+
+               rcu_read_lock();
+               node = cds_lfq_dequeue_rcu(&q);
+               rcu_read_unlock();
 
                if (node) {
-                       urcu_ref_put(&node->ref, rcu_release_node);
+                       urcu_ref_put(&node->ref, ref_release_node);
                        nr_successful_dequeues++;
                }
 
@@ -255,16 +271,18 @@ void *thr_dequeuer(void *_count)
 
 static void release_node(struct urcu_ref *ref)
 {
-       struct rcu_lfq_node *node = container_of(ref, struct rcu_lfq_node, ref);
+       struct cds_lfq_node_rcu *node = caa_container_of(ref, struct cds_lfq_node_rcu, ref);
        free(node);
 }
 
-void test_end(struct rcu_lfq_queue *q, unsigned long long *nr_dequeues)
+void test_end(struct cds_lfq_queue_rcu *q, unsigned long long *nr_dequeues)
 {
-       struct rcu_lfq_node *node;
+       struct cds_lfq_node_rcu *node;
 
        do {
-               node = rcu_lfq_dequeue(q, release_node);
+               rcu_read_lock();
+               node = cds_lfq_dequeue_rcu(q);
+               rcu_read_unlock();
                if (node) {
                        urcu_ref_put(&node->ref, release_node);
                        (*nr_dequeues)++;
@@ -363,7 +381,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_lfq_init(&q);
+       cds_lfq_init_rcu(&q, ref_release_node);
 
        next_aff = 0;
 
@@ -380,7 +398,7 @@ int main(int argc, char **argv)
                        exit(1);
        }
 
-       smp_mb();
+       cmm_smp_mb();
 
        test_go = 1;