Fix tests: finer-grained use of CPU_SET, CPU_ZERO and cpu_set_t

[urcu.git] / tests / test_urcu_wfcq.c

diff --git a/tests/test_urcu_wfcq.c b/tests/test_urcu_wfcq.c
index 939bf7a7bc77a5459d0ce683d9e72c0c40d9820b..124968d3ec702fd89368edc8ecf565710f771f0f 100644 (file)
--- a/tests/test_urcu_wfcq.c
+++ b/tests/test_urcu_wfcq.c
@@ -34,11 +34,12 @@
 #include <unistd.h>
 #include <stdio.h>
 #include <assert.h>
-#include <sched.h>
 #include <errno.h>
 
 #include <urcu/arch.h>
 #include <urcu/tls-compat.h>
+#include <urcu/uatomic.h>
+#include "cpuset.h"
 
 #ifdef __linux__
 #include <syscall.h>
@@ -65,7 +66,6 @@ static inline pid_t gettid(void)
 #ifndef DYNAMIC_LINK_TEST
 #define _LGPL_SOURCE
 #endif
-#include <urcu.h>
 #include <urcu/wfcqueue.h>
 
 enum test_sync {
@@ -109,12 +109,6 @@ static int use_affinity = 0;
 
 pthread_mutex_t affinity_mutex = PTHREAD_MUTEX_INITIALIZER;
 
-#ifndef HAVE_CPU_SET_T
-typedef unsigned long cpu_set_t;
-# define CPU_ZERO(cpuset) do { *(cpuset) = 0; } while(0)
-# define CPU_SET(cpu, cpuset) do { *(cpuset) |= (1UL << (cpu)); } while(0)
-#endif
-
 static void set_affinity(void)
 {
 #if HAVE_SCHED_SETAFFINITY
@@ -544,7 +538,7 @@ int main(int argc, char **argv)
                       tot_enqueues, tot_dequeues);
        printf_verbose("total number of successful enqueues : %llu, "
                       "enqueues to empty dest : %llu, "
-                      "successful dequeues %llu, ",
+                      "successful dequeues %llu, "
                       "splice : %llu\n",
                       tot_successful_enqueues,
                       tot_empty_dest_enqueues,