X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=tests%2Ftest_urcu_wfq.c;h=83ec6359f2c40710dc9ceb05ef2f39cbbb45868c;hb=cc6b0c208a9707f8a64609a51167290caeace288;hp=d446e47bb763d13d29350b06ed135866582e47dc;hpb=5481ddb381061bda64aebc039900d21cac6a6caf;p=urcu.git

diff --git a/tests/test_urcu_wfq.c b/tests/test_urcu_wfq.c
index d446e47..83ec635 100644
--- a/tests/test_urcu_wfq.c
+++ b/tests/test_urcu_wfq.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
 
@@ -76,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;
@@ -153,7 +156,7 @@ static unsigned long long __thread nr_successful_enqueues;
 static unsigned int nr_enqueuers;
 static unsigned int nr_dequeuers;
 
-static struct wfq_queue q;
+static struct cds_wfq_queue q;
 
 void *thr_enqueuer(void *_count)
 {
@@ -170,18 +173,18 @@ void *thr_enqueuer(void *_count)
 	cmm_smp_mb();
 
 	for (;;) {
-		struct wfq_node *node = malloc(sizeof(*node));
+		struct cds_wfq_node *node = malloc(sizeof(*node));
 		if (!node)
 			goto fail;
-		wfq_node_init(node);
-		wfq_enqueue(&q, node);
+		cds_wfq_node_init(node);
+		cds_wfq_enqueue(&q, 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;
 	}
 
@@ -210,7 +213,7 @@ void *thr_dequeuer(void *_count)
 	cmm_smp_mb();
 
 	for (;;) {
-		struct wfq_node *node = wfq_dequeue_blocking(&q);
+		struct cds_wfq_node *node = cds_wfq_dequeue_blocking(&q);
 
 		if (node) {
 			free(node);
@@ -218,9 +221,9 @@ void *thr_dequeuer(void *_count)
 		}
 
 		nr_dequeues++;
-		if (unlikely(!test_duration_dequeue()))
+		if (caa_unlikely(!test_duration_dequeue()))
 			break;
-		if (unlikely(rduration))
+		if (caa_unlikely(rduration))
 			loop_sleep(rduration);
 	}
 
@@ -233,12 +236,12 @@ void *thr_dequeuer(void *_count)
 	return ((void*)2);
 }
 
-void test_end(struct wfq_queue *q, unsigned long long *nr_dequeues)
+void test_end(struct cds_wfq_queue *q, unsigned long long *nr_dequeues)
 {
-	struct wfq_node *node;
+	struct cds_wfq_node *node;
 
 	do {
-		node = wfq_dequeue_blocking(q);
+		node = cds_wfq_dequeue_blocking(q);
 		if (node) {
 			free(node);
 			(*nr_dequeues)++;
@@ -337,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);
-	wfq_init(&q);
+	cds_wfq_init(&q);
 
 	next_aff = 0;