X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Fapi.h;h=dced0d8d204e15b84252f1f374f7b5027d12490b;hb=17fb31883652e28774dbb148f7237382de3ab504;hp=9746ea4389cd945cec76eb75043d9732b54ed64f;hpb=3282a76b46b74a92809292fa63ba671de9ad88eb;p=urcu.git

diff --git a/tests/api.h b/tests/api.h
index 9746ea4..dced0d8 100644
--- a/tests/api.h
+++ b/tests/api.h
@@ -29,6 +29,7 @@
 
 #include <urcu/compiler.h>
 #include <urcu/arch.h>
+#include "cpuset.h"
 
 /*
  * Machine parameters.
@@ -65,7 +66,6 @@
 #include <limits.h>
 #include <sys/types.h>
 #include <pthread.h>
-#include <sched.h>
 #include <sys/param.h>
 /* #include "atomic.h" */
 
@@ -151,13 +151,14 @@ static int __smp_thread_id(void)
 	}
 	spin_lock(&__thread_id_map_mutex);
 	for (i = 0; i < NR_THREADS; i++) {
-		if (__thread_id_map[i] == tid)
+		if (__thread_id_map[i] == tid) {
 			spin_unlock(&__thread_id_map_mutex);
 			return i;
+		}
 	}
 	spin_unlock(&__thread_id_map_mutex);
-	fprintf(stderr, "smp_thread_id: Rogue thread, id: %d(%#x)\n",
-			(int)tid, (int)tid);
+	fprintf(stderr, "smp_thread_id: Rogue thread, id: %lu(%#lx)\n",
+			(unsigned long) tid, (unsigned long) tid);
 	exit(-1);
 }
 
@@ -206,8 +207,8 @@ static void *wait_thread(thread_id_t tid)
 			break;
 	}
 	if (i >= NR_THREADS){
-		fprintf(stderr, "wait_thread: bad tid = %d(%#x)\n",
-				(int)tid, (int)tid);
+		fprintf(stderr, "wait_thread: bad tid = %lu(%#lx)\n",
+				(unsigned long)tid, (unsigned long)tid);
 		exit(-1);
 	}
 	if (pthread_join(tid, &vp) != 0) {
@@ -231,12 +232,6 @@ static void wait_all_threads(void)
 	}
 }
 
-#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 run_on(int cpu)
 {
 #if HAVE_SCHED_SETAFFINITY