X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=tests%2Ftest_urcu_lfq.c;h=cd72fac5cae2079992f7e8d3bab5d899ef841f4a;hb=b7ef17d170fe415c082fb22af19f49188554f05c;hp=7aaad999587bb6e5a953cd40817fae4034d46d57;hpb=9bfaf0cab9a326b89b9ee83e0bb0679918a3023a;p=urcu.git

diff --git a/tests/test_urcu_lfq.c b/tests/test_urcu_lfq.c
index 7aaad99..cd72fac 100644
--- a/tests/test_urcu_lfq.c
+++ b/tests/test_urcu_lfq.c
@@ -63,7 +63,6 @@ static inline pid_t gettid(void)
 #endif
 #include <urcu.h>
 #include <urcu/rculfqueue.h>
-#include <urcu-defer.h>
 
 static volatile int test_go, test_stop;
 
@@ -177,7 +176,9 @@ void *thr_enqueuer(void *_count)
 		if (!node)
 			goto fail;
 		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,12 +201,18 @@ fail:
 
 }
 
-static void rcu_release_node(struct urcu_ref *ref)
+static void rcu_free_node(struct rcu_head *head)
 {
-	struct cds_lfq_node_rcu *node = caa_container_of(ref, struct cds_lfq_node_rcu, 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)
@@ -218,11 +225,6 @@ void *thr_dequeuer(void *_count)
 
 	set_affinity();
 
-	ret = rcu_defer_register_thread();
-	if (ret) {
-		printf("Error in rcu_defer_register_thread\n");
-		exit(-1);
-	}
 	rcu_register_thread();
 
 	while (!test_go)
@@ -231,11 +233,14 @@ void *thr_dequeuer(void *_count)
 	cmm_smp_mb();
 
 	for (;;) {
-		struct cds_lfq_node_rcu *node = cds_lfq_dequeue_rcu(&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++;
 		}
 
@@ -247,8 +252,6 @@ void *thr_dequeuer(void *_count)
 	}
 
 	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,
@@ -269,7 +272,9 @@ void test_end(struct cds_lfq_queue_rcu *q, unsigned long long *nr_dequeues)
 	struct cds_lfq_node_rcu *node;
 
 	do {
-		node = cds_lfq_dequeue_rcu(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)++;
@@ -368,7 +373,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);
-	cds_lfq_init_rcu(&q);
+	cds_lfq_init_rcu(&q, ref_release_node);
 
 	next_aff = 0;