Deprecate wfqueue

[urcu.git] / tests / test_urcu_wfq.c

diff --git a/tests/test_urcu_wfq.c b/tests/test_urcu_wfq.c
index bcdd4c0c461b434dec90d6f69159feb77924b9ed..d1760414f30378151a62d8c34656e9f09002d6fc 100644 (file)
--- a/tests/test_urcu_wfq.c
+++ b/tests/test_urcu_wfq.c
@@ -34,11 +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>
+#include <urcu/tls-compat.h>
+
+#ifdef __linux__
+#include <syscall.h>
+#endif
 
 /* hardcoded number of CPUs */
 #define NR_CPUS 16384
@@ -61,6 +65,10 @@ static inline pid_t gettid(void)
 #ifndef DYNAMIC_LINK_TEST
 #define _LGPL_SOURCE
 #endif
+
+/* Remove deprecation warnings from test build. */
+#define CDS_WFQ_DEPRECATED
+
 #include <urcu.h>
 #include <urcu/wfqueue.h>
 
@@ -73,9 +81,9 @@ static unsigned long duration;
 /* read-side C.S. duration, in loops */
 static unsigned long wdelay;
 
-static inline void loop_sleep(unsigned long l)
+static inline void loop_sleep(unsigned long loops)
 {
-       while(l-- != 0)
+       while (loops-- != 0)
                caa_cpu_relax();
 }
 
@@ -101,9 +109,10 @@ typedef unsigned long cpu_set_t;
 
 static void set_affinity(void)
 {
+#if HAVE_SCHED_SETAFFINITY
        cpu_set_t mask;
-       int cpu;
-       int ret;
+       int cpu, ret;
+#endif /* HAVE_SCHED_SETAFFINITY */
 
        if (!use_affinity)
                return;
@@ -144,11 +153,11 @@ static int test_duration_enqueue(void)
        return !test_stop;
 }
 
-static unsigned long long __thread nr_dequeues;
-static unsigned long long __thread nr_enqueues;
+static DEFINE_URCU_TLS(unsigned long long, nr_dequeues);
+static DEFINE_URCU_TLS(unsigned long long, nr_enqueues);
 
-static unsigned long long __thread nr_successful_dequeues;
-static unsigned long long __thread nr_successful_enqueues;
+static DEFINE_URCU_TLS(unsigned long long, nr_successful_dequeues);
+static DEFINE_URCU_TLS(unsigned long long, nr_successful_enqueues);
 
 static unsigned int nr_enqueuers;
 static unsigned int nr_dequeuers;
@@ -175,22 +184,22 @@ void *thr_enqueuer(void *_count)
                        goto fail;
                cds_wfq_node_init(node);
                cds_wfq_enqueue(&q, node);
-               nr_successful_enqueues++;
+               URCU_TLS(nr_successful_enqueues)++;
 
-               if (unlikely(wdelay))
+               if (caa_unlikely(wdelay))
                        loop_sleep(wdelay);
 fail:
-               nr_enqueues++;
-               if (unlikely(!test_duration_enqueue()))
+               URCU_TLS(nr_enqueues)++;
+               if (caa_unlikely(!test_duration_enqueue()))
                        break;
        }
 
-       count[0] = nr_enqueues;
-       count[1] = nr_successful_enqueues;
+       count[0] = URCU_TLS(nr_enqueues);
+       count[1] = URCU_TLS(nr_successful_enqueues);
        printf_verbose("enqueuer thread_end, thread id : %lx, tid %lu, "
                       "enqueues %llu successful_enqueues %llu\n",
-                      pthread_self(), (unsigned long)gettid(), nr_enqueues,
-                      nr_successful_enqueues);
+                      pthread_self(), (unsigned long)gettid(),
+                      URCU_TLS(nr_enqueues), URCU_TLS(nr_successful_enqueues));
        return ((void*)1);
 
 }
@@ -214,22 +223,22 @@ void *thr_dequeuer(void *_count)
 
                if (node) {
                        free(node);
-                       nr_successful_dequeues++;
+                       URCU_TLS(nr_successful_dequeues)++;
                }
 
-               nr_dequeues++;
-               if (unlikely(!test_duration_dequeue()))
+               URCU_TLS(nr_dequeues)++;
+               if (caa_unlikely(!test_duration_dequeue()))
                        break;
-               if (unlikely(rduration))
+               if (caa_unlikely(rduration))
                        loop_sleep(rduration);
        }
 
        printf_verbose("dequeuer thread_end, thread id : %lx, tid %lu, "
                       "dequeues %llu, successful_dequeues %llu\n",
-                      pthread_self(), (unsigned long)gettid(), nr_dequeues,
-                      nr_successful_dequeues);
-       count[0] = nr_dequeues;
-       count[1] = nr_successful_dequeues;
+                      pthread_self(), (unsigned long)gettid(),
+                      URCU_TLS(nr_dequeues), URCU_TLS(nr_successful_dequeues));
+       count[0] = URCU_TLS(nr_dequeues);
+       count[1] = URCU_TLS(nr_successful_dequeues);
        return ((void*)2);
 }