X-Git-Url: https://git.lttng.org/?p=urcu.git;a=blobdiff_plain;f=tests%2Ftest_urcu_lfs.c;h=67ccaa25f3f9911e77acbc22d62f43ba6d84ed1c;hp=28e3e0678cf0b4b163786b97bb024d8a8d42c9ce;hb=0663713865a25964c2932943c48e59ddf3caecd8;hpb=6ff854acfa013195bdb71dddc654ec76a4c296c9

diff --git a/tests/test_urcu_lfs.c b/tests/test_urcu_lfs.c
index 28e3e06..67ccaa2 100644
--- a/tests/test_urcu_lfs.c
+++ b/tests/test_urcu_lfs.c
@@ -34,11 +34,11 @@
 #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 "cpuset.h"
 
 #ifdef __linux__
 #include <syscall.h>
@@ -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
@@ -349,15 +343,17 @@ static void test_end(struct cds_lfs_stack *s, unsigned long long *nr_dequeues)
 
 static void show_usage(int argc, char **argv)
 {
-	printf("Usage : %s nr_dequeuers nr_enqueuers duration (s)", argv[0]);
-	printf(" [-d delay] (enqueuer period (in loops))");
-	printf(" [-c duration] (dequeuer period (in loops))");
-	printf(" [-v] (verbose output)");
-	printf(" [-a cpu#] [-a cpu#]... (affinity)");
-	printf(" [-p] (test pop)");
-	printf(" [-P] (test pop_all, enabled by default)");
-	printf(" [-R] (use RCU external synchronization)");
-	printf("      Note: default: no external synchronization used.");
+	printf("Usage : %s nr_dequeuers nr_enqueuers duration (s) <OPTIONS>\n",
+		argv[0]);
+	printf("OPTIONS:\n");
+	printf("	[-d delay] (enqueuer period (in loops))\n");
+	printf("	[-c duration] (dequeuer period (in loops))\n");
+	printf("	[-v] (verbose output)\n");
+	printf("	[-a cpu#] [-a cpu#]... (affinity)\n");
+	printf("	[-p] (test pop)\n");
+	printf("	[-P] (test pop_all, enabled by default)\n");
+	printf("	[-R] (use RCU external synchronization)\n");
+	printf("		Note: default: no external synchronization used.\n");
 	printf("\n");
 }