X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=tests%2Ftest_urcu_wfs.c;h=cb85545a3ddad5be878a82013febd6f20bcd5c76;hb=372b9ad7acc40810bbcec6a796c71b54901b3ca7;hp=5e7b0ec4367fbcb2b94ee2a5452e741788d1efe2;hpb=69328034b804a0fc180c08f7ca6be1a4446bb105;p=urcu.git

diff --git a/tests/test_urcu_wfs.c b/tests/test_urcu_wfs.c
index 5e7b0ec..cb85545 100644
--- a/tests/test_urcu_wfs.c
+++ b/tests/test_urcu_wfs.c
@@ -172,12 +172,13 @@ static unsigned int nr_dequeuers;
 
 static struct cds_wfs_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();
 
@@ -206,7 +207,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);
 
@@ -247,13 +249,14 @@ static 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;
 
 	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();
 
@@ -286,14 +289,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_wfs_stack *s, unsigned long long *nr_dequeues)
+static void test_end(struct cds_wfs_stack *s, unsigned long long *nr_dequeues)
 {
 	struct cds_wfs_node *node;
 
@@ -306,7 +310,7 @@ void test_end(struct cds_wfs_stack *s, unsigned long long *nr_dequeues)
 	} while (node);
 }
 
-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))");
@@ -409,10 +413,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_MUTEX)
+		printf_verbose("External sync: mutex.\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);