X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=tests%2Ftest_urcu_lfs.c;h=a7f9af3abd5086ee21e73aa0f3269530e612886a;hb=7618919ae496bda84a2efa4f2ad0abe569892a9e;hp=8335f2459f1f05533da21d5f0cc557ef815e28d9;hpb=16aa9ee87cf4364921c36025359be01390338d87;p=userspace-rcu.git

diff --git a/tests/test_urcu_lfs.c b/tests/test_urcu_lfs.c
index 8335f24..a7f9af3 100644
--- a/tests/test_urcu_lfs.c
+++ b/tests/test_urcu_lfs.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
 
@@ -62,7 +65,7 @@ static inline pid_t gettid(void)
 #define _LGPL_SOURCE
 #endif
 #include <urcu.h>
-#include <urcu/rculfstack.h>
+#include <urcu/cds.h>
 #include <urcu-defer.h>
 
 static volatile int test_go, test_stop;
@@ -177,6 +180,7 @@ void *thr_enqueuer(void *_count)
 		if (!node)
 			goto fail;
 		cds_lfs_node_init_rcu(node);
+		/* No rcu read-side is needed for push */
 		cds_lfs_push_rcu(&s, node);
 		nr_successful_enqueues++;
 
@@ -203,13 +207,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 +227,13 @@ void *thr_dequeuer(void *_count)
 	cmm_smp_mb();
 
 	for (;;) {
-		struct cds_lfs_node_rcu *node = cds_lfs_pop_rcu(&s);
+		struct cds_lfs_node_rcu *node;
 
+		node = cds_lfs_pop_rcu(&s);
 		if (node) {
 			defer_rcu(free, node);
 			nr_successful_dequeues++;
 		}
-
 		nr_dequeues++;
 		if (unlikely(!test_duration_dequeue()))
 			break;