From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Fri, 10 Jun 2011 00:38:17 +0000 (-0400)
Subject: lfqueue: don't use defer_rcu anymore
X-Git-Tag: v0.6.0~19
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=b7ef17d170fe415c082fb22af19f49188554f05c;p=urcu.git

lfqueue: don't use defer_rcu anymore

lfqueue now uses call_rcu instead.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 3d68507..3800260 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -155,8 +155,8 @@ test_urcu_bp_SOURCES = test_urcu_bp.c $(URCU_BP)
 test_urcu_bp_dynamic_link_SOURCES = test_urcu_bp.c $(URCU_BP)
 test_urcu_bp_dynamic_link_CFLAGS = -DDYNAMIC_LINK_TEST $(AM_CFLAGS)
 
-test_urcu_lfq_SOURCES = test_urcu_lfq.c
-test_urcu_lfq_dynlink_SOURCES = test_urcu_lfq.c
+test_urcu_lfq_SOURCES = test_urcu_lfq.c $(URCU)
+test_urcu_lfq_dynlink_SOURCES = test_urcu_lfq.c $(URCU)
 test_urcu_lfq_dynlink_CFLAGS = -DDYNAMIC_LINK_TEST $(AM_CFLAGS)
 test_urcu_lfq_dynlink_LDADD = $(URCU_CDS_LIB)
 
diff --git a/tests/test_urcu_lfq.c b/tests/test_urcu_lfq.c
index 15023f6..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;
 
@@ -226,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)
@@ -258,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,