Build and run regression and unit tests as C++ programs

[urcu.git] / tests / common / api.h

diff --git a/tests/common/api.h b/tests/common/api.h
index 35a8037e1f3d7efdcd6398b9406ce36989dfdfde..a260463ad09ea212bb7ee4517a2fd995f21b2d74 100644 (file)
--- a/tests/common/api.h
+++ b/tests/common/api.h
@@ -26,7 +26,6 @@
 
 #include <urcu/compiler.h>
 #include <urcu/arch.h>
-#include "cpuset.h"
 
 /*
  * Machine parameters.
@@ -166,7 +165,7 @@ static int smp_thread_id(void)
        id = pthread_getspecific(thread_id_key);
        if (id == NULL)
                return __smp_thread_id();
-       return (long)(id - 1);
+       return ((long) id - 1);
 }
 
 static thread_id_t create_thread(void *(*func)(void *), void *arg)
@@ -229,25 +228,26 @@ static void wait_all_threads(void)
        }
 }
 
+#ifdef HAVE_SCHED_SETAFFINITY
 static void run_on(int cpu)
 {
-#if HAVE_SCHED_SETAFFINITY
        cpu_set_t mask;
 
        CPU_ZERO(&mask);
        CPU_SET(cpu, &mask);
-#if SCHED_SETAFFINITY_ARGS == 2
-       sched_setaffinity(0, &mask);
-#else
        sched_setaffinity(0, sizeof(mask), &mask);
-#endif
-#endif /* HAVE_SCHED_SETAFFINITY */
 }
+#else
+
+static void run_on(int cpu __attribute__((unused)))
+{}
+#endif /* HAVE_SCHED_SETAFFINITY */
 
 /*
  * timekeeping -- very crude -- should use MONOTONIC...
  */
 
+static inline
 long long get_microseconds(void)
 {
        struct timeval tv;