X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=tests%2Ftest_urcu_lfq.c;h=82a90b0cdecc23f05c3572cf6b6819f00ac72531;hb=7618919ae496bda84a2efa4f2ad0abe569892a9e;hp=b5cd559d0431302e378e5e672424592912befcf6;hpb=e5a7d7098f8ed32390c53e166e9638b55d2a38dc;p=userspace-rcu.git

diff --git a/tests/test_urcu_lfq.c b/tests/test_urcu_lfq.c
index b5cd559..82a90b0 100644
--- a/tests/test_urcu_lfq.c
+++ b/tests/test_urcu_lfq.c
@@ -34,12 +34,15 @@
 #include <unistd.h>
 #include <stdio.h>
 #include <assert.h>
-#include <sys/syscall.h>
 #include <sched.h>
 #include <errno.h>
 
 #include <urcu/arch.h>
 
+#ifdef __linux__
+#include <syscall.h>
+#endif
+
 /* hardcoded number of CPUs */
 #define NR_CPUS 16384
 
@@ -63,6 +66,7 @@ static inline pid_t gettid(void)
 #endif
 #include <urcu.h>
 #include <urcu/cds.h>
+#include <urcu-defer.h>
 
 static volatile int test_go, test_stop;
 
@@ -176,9 +180,7 @@ 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))
@@ -201,20 +203,6 @@ fail:
 
 }
 
-static void rcu_free_node(struct rcu_head *head)
-{
-	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;
@@ -225,6 +213,11 @@ 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)
@@ -235,12 +228,9 @@ void *thr_dequeuer(void *_count)
 	for (;;) {
 		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, ref_release_node);
+			defer_rcu(free, node);
 			nr_successful_dequeues++;
 		}
 
@@ -252,6 +242,7 @@ 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,
@@ -261,22 +252,14 @@ void *thr_dequeuer(void *_count)
 	return ((void*)2);
 }
 
-static void release_node(struct urcu_ref *ref)
-{
-	struct cds_lfq_node_rcu *node = caa_container_of(ref, struct cds_lfq_node_rcu, ref);
-	free(node);
-}
-
 void test_end(struct cds_lfq_queue_rcu *q, unsigned long long *nr_dequeues)
 {
 	struct cds_lfq_node_rcu *node;
 
 	do {
-		rcu_read_lock();
 		node = cds_lfq_dequeue_rcu(q);
-		rcu_read_unlock();
 		if (node) {
-			urcu_ref_put(&node->ref, release_node);
+			free(node);	/* no more concurrent access */
 			(*nr_dequeues)++;
 		}
 	} while (node);
@@ -373,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);
-	cds_lfq_init_rcu(&q, ref_release_node);
+	cds_lfq_init_rcu(&q);
 
 	next_aff = 0;
 
@@ -418,6 +401,8 @@ int main(int argc, char **argv)
 	}
 	
 	test_end(&q, &end_dequeues);
+	err = cds_lfq_destroy_rcu(&q);
+	assert(!err);
 
 	printf_verbose("total number of enqueues : %llu, dequeues %llu\n",
 		       tot_enqueues, tot_dequeues);