X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=tests%2Ftest_urcu_lfs.c;h=9636f5bb0da7a935f3e52092d0b3cbef1278cea8;hb=8bad63a0394e7f76f344e065cc90327c099eae8e;hp=aad750a410bcb541c150a985a980f12b346d33b5;hpb=111ce0c32c06f79ddcf3c2af3b869a8563106433;p=urcu.git

diff --git a/tests/test_urcu_lfs.c b/tests/test_urcu_lfs.c
index aad750a..9636f5b 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
@@ -177,12 +171,13 @@ struct test {
 
 static struct cds_lfs_stack s;
 
-void *thr_enqueuer(void *_count)
+static void *thr_enqueuer(void *_count)
 {
 	unsigned long long *count = _count;
 
 	printf_verbose("thread_begin %s, thread id : %lx, tid %lu\n",
-			"enqueuer", pthread_self(), (unsigned long)gettid());
+			"enqueuer", (unsigned long) pthread_self(),
+			(unsigned long) gettid());
 
 	set_affinity();
 
@@ -215,7 +210,8 @@ fail:
 	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(),
+		       pthread_self(),
+			(unsigned long) gettid(),
 		       URCU_TLS(nr_enqueues), URCU_TLS(nr_successful_enqueues));
 	return ((void*)1);
 
@@ -275,12 +271,14 @@ void do_test_pop_all(enum test_sync sync)
 
 }
 
-void *thr_dequeuer(void *_count)
+static void *thr_dequeuer(void *_count)
 {
 	unsigned long long *count = _count;
+	unsigned int counter = 0;
 
 	printf_verbose("thread_begin %s, thread id : %lx, tid %lu\n",
-			"dequeuer", pthread_self(), (unsigned long)gettid());
+			"dequeuer", (unsigned long) pthread_self(),
+			(unsigned long) gettid());
 
 	set_affinity();
 
@@ -294,8 +292,6 @@ void *thr_dequeuer(void *_count)
 	assert(test_pop || test_pop_all);
 
 	for (;;) {
-		unsigned int counter = 0;
-
 		if (test_pop && test_pop_all) {
 			/* both pop and pop all */
 			if (counter & 1)
@@ -320,14 +316,15 @@ void *thr_dequeuer(void *_count)
 
 	printf_verbose("dequeuer thread_end, thread id : %lx, tid %lu, "
 		       "dequeues %llu, successful_dequeues %llu\n",
-		       pthread_self(), (unsigned long)gettid(),
+		       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);
 }
 
-void test_end(struct cds_lfs_stack *s, unsigned long long *nr_dequeues)
+static void test_end(struct cds_lfs_stack *s, unsigned long long *nr_dequeues)
 {
 	struct cds_lfs_node *snode;
 
@@ -343,17 +340,19 @@ void test_end(struct cds_lfs_stack *s, unsigned long long *nr_dequeues)
 	} while (snode);
 }
 
-void show_usage(int argc, char **argv)
+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");
 }
 
@@ -446,10 +445,15 @@ int main(int argc, char **argv)
 		printf_verbose("pop test activated.\n");
 	if (test_pop_all)
 		printf_verbose("pop_all test activated.\n");
+	if (test_sync == TEST_SYNC_RCU)
+		printf_verbose("External sync: RCU.\n");
+	else
+		printf_verbose("External sync: none.\n");
 	printf_verbose("Writer delay : %lu loops.\n", rduration);
 	printf_verbose("Reader duration : %lu loops.\n", wdelay);
 	printf_verbose("thread %-6s, thread id : %lx, tid %lu\n",
-			"main", pthread_self(), (unsigned long)gettid());
+			"main", (unsigned long) pthread_self(),
+			(unsigned long) gettid());
 
 	tid_enqueuer = malloc(sizeof(*tid_enqueuer) * nr_enqueuers);
 	tid_dequeuer = malloc(sizeof(*tid_dequeuer) * nr_dequeuers);