X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=tests%2Ftest_urcu_wfs.c;h=7746a1d17447e332c1e88b6cf18523c49c57f439;hb=cc6b0c208a9707f8a64609a51167290caeace288;hp=73655c1dcec7c6ffbb8b23f42d2acb544eb54ff0;hpb=7ab587e26cf2474852b1f19189a958c31a5c6980;p=urcu.git

diff --git a/tests/test_urcu_wfs.c b/tests/test_urcu_wfs.c
index 73655c1..7746a1d 100644
--- a/tests/test_urcu_wfs.c
+++ b/tests/test_urcu_wfs.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,8 +65,7 @@ static inline pid_t gettid(void)
 #define _LGPL_SOURCE
 #endif
 #include <urcu.h>
-#include <urcu/rcuwfstack.h>
-#include <urcu-defer.h>
+#include <urcu/wfstack.h>
 
 static volatile int test_go, test_stop;
 
@@ -77,7 +79,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 +156,7 @@ static unsigned long long __thread nr_successful_enqueues;
 static unsigned int nr_enqueuers;
 static unsigned int nr_dequeuers;
 
-static struct rcu_wfs_stack s;
+static struct cds_wfs_stack s;
 
 void *thr_enqueuer(void *_count)
 {
@@ -165,31 +167,27 @@ void *thr_enqueuer(void *_count)
 
 	set_affinity();
 
-	rcu_register_thread();
-
 	while (!test_go)
 	{
 	}
-	smp_mb();
+	cmm_smp_mb();
 
 	for (;;) {
-		struct rcu_wfs_node *node = malloc(sizeof(*node));
+		struct cds_wfs_node *node = malloc(sizeof(*node));
 		if (!node)
 			goto fail;
-		rcu_wfs_node_init(node);
-		rcu_wfs_push(&s, node);
+		cds_wfs_node_init(node);
+		cds_wfs_push(&s, node);
 		nr_successful_enqueues++;
 
-		if (unlikely(wdelay))
+		if (caa_unlikely(wdelay))
 			loop_sleep(wdelay);
 fail:
 		nr_enqueues++;
-		if (unlikely(!test_duration_enqueue()))
+		if (caa_unlikely(!test_duration_enqueue()))
 			break;
 	}
 
-	rcu_unregister_thread();
-
 	count[0] = nr_enqueues;
 	count[1] = nr_successful_enqueues;
 	printf_verbose("enqueuer thread_end, thread id : %lx, tid %lu, "
@@ -209,32 +207,26 @@ void *thr_dequeuer(void *_count)
 
 	set_affinity();
 
-	rcu_defer_register_thread();
-	rcu_register_thread();
-
 	while (!test_go)
 	{
 	}
-	smp_mb();
+	cmm_smp_mb();
 
 	for (;;) {
-		struct rcu_wfs_node *node = rcu_wfs_pop_blocking(&s);
+		struct cds_wfs_node *node = cds_wfs_pop_blocking(&s);
 
 		if (node) {
-			defer_rcu(free, node);
+			free(node);
 			nr_successful_dequeues++;
 		}
 
 		nr_dequeues++;
-		if (unlikely(!test_duration_dequeue()))
+		if (caa_unlikely(!test_duration_dequeue()))
 			break;
-		if (unlikely(rduration))
+		if (caa_unlikely(rduration))
 			loop_sleep(rduration);
 	}
 
-	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,
@@ -244,12 +236,12 @@ void *thr_dequeuer(void *_count)
 	return ((void*)2);
 }
 
-void test_end(struct rcu_wfs_stack *s, unsigned long long *nr_dequeues)
+void test_end(struct cds_wfs_stack *s, unsigned long long *nr_dequeues)
 {
-	struct rcu_wfs_node *node;
+	struct cds_wfs_node *node;
 
 	do {
-		node = rcu_wfs_pop_blocking(s);
+		node = cds_wfs_pop_blocking(s);
 		if (node) {
 			free(node);
 			(*nr_dequeues)++;
@@ -348,7 +340,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_wfs_init(&s);
+	cds_wfs_init(&s);
 
 	next_aff = 0;
 
@@ -365,7 +357,7 @@ int main(int argc, char **argv)
 			exit(1);
 	}
 
-	smp_mb();
+	cmm_smp_mb();
 
 	test_go = 1;