Cleanup test usage printout

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/tests/test_mutex.c b/tests/test_mutex.c
index 1230934ec790900b7121514e8316cbf74af622c4..e5fbf1a22b26e453112777cb3027ff94f278a6f0 100644 (file)
--- a/tests/test_mutex.c
+++ b/tests/test_mutex.c
@@ -256,15 +256,17 @@ void *thr_writer(void *data)
 
 void show_usage(int argc, char **argv)
 {
-       printf("Usage : %s nr_readers nr_writers duration (s)", argv[0]);
+       printf("Usage : %s nr_readers nr_writers duration (s) <OPTIONS>\n",
+               argv[0]);
+       printf("OPTIONS:\n");
 #ifdef DEBUG_YIELD
-       printf(" [-r] [-w] (yield reader and/or writer)");
+       printf("        [-r] [-w] (yield reader and/or writer)\n");
 #endif
-       printf(" [-d delay] (writer period (us))");
-       printf(" [-c duration] (reader C.S. duration (in loops))");
-       printf(" [-e duration] (writer C.S. duration (in loops))");
-       printf(" [-v] (verbose output)");
-       printf(" [-a cpu#] [-a cpu#]... (affinity)");
+       printf("        [-d delay] (writer period (us))\n");
+       printf("        [-c duration] (reader C.S. duration (in loops))\n");
+       printf("        [-e duration] (writer C.S. duration (in loops))\n");
+       printf("        [-v] (verbose output)\n");
+       printf("        [-a cpu#] [-a cpu#]... (affinity)\n");
        printf("\n");
 }
 

diff --git a/tests/test_perthreadlock.c b/tests/test_perthreadlock.c
index 2a8b0c3718c6b4aa964d83c244e1a7284715e77b..59c1ae6038e7fb9721a6adfaba19ed548a0aa19a 100644 (file)
--- a/tests/test_perthreadlock.c
+++ b/tests/test_perthreadlock.c
@@ -265,15 +265,17 @@ void *thr_writer(void *data)
 
 void show_usage(int argc, char **argv)
 {
-       printf("Usage : %s nr_readers nr_writers duration (s)", argv[0]);
+       printf("Usage : %s nr_readers nr_writers duration (s) <OPTIONS>\n",
+               argv[0]);
+       printf("OPTIONS:\n");
 #ifdef DEBUG_YIELD
-       printf(" [-r] [-w] (yield reader and/or writer)");
+       printf("        [-r] [-w] (yield reader and/or writer)\n");
 #endif
-       printf(" [-d delay] (writer period (us))");
-       printf(" [-c duration] (reader C.S. duration (in loops))");
-       printf(" [-e duration] (writer C.S. duration (in loops))");
-       printf(" [-v] (verbose output)");
-       printf(" [-a cpu#] [-a cpu#]... (affinity)");
+       printf("        [-d delay] (writer period (us))\n");
+       printf("        [-c duration] (reader C.S. duration (in loops))\n");
+       printf("        [-e duration] (writer C.S. duration (in loops))\n");
+       printf("        [-v] (verbose output)\n");
+       printf("        [-a cpu#] [-a cpu#]... (affinity)\n");
        printf("\n");
 }
 

diff --git a/tests/test_rwlock.c b/tests/test_rwlock.c
index ae1eaf421a10737c6f9618191c01bdbfd9e628e5..aa53b3bad44fdf896854fc6a4dfd56f28e2518c0 100644 (file)
--- a/tests/test_rwlock.c
+++ b/tests/test_rwlock.c
@@ -252,15 +252,17 @@ void *thr_writer(void *_count)
 
 void show_usage(int argc, char **argv)
 {
-       printf("Usage : %s nr_readers nr_writers duration (s)", argv[0]);
+       printf("Usage : %s nr_readers nr_writers duration (s) <OPTIONS>\n",
+               argv[0]);
+       printf("OPTIONS:\n");
 #ifdef DEBUG_YIELD
-       printf(" [-r] [-w] (yield reader and/or writer)");
+       printf("        [-r] [-w] (yield reader and/or writer)\n");
 #endif
-       printf(" [-d delay] (writer period (us))");
-       printf(" [-c duration] (reader C.S. duration (in loops))");
-       printf(" [-e duration] (writer C.S. duration (in loops))");
-       printf(" [-v] (verbose output)");
-       printf(" [-a cpu#] [-a cpu#]... (affinity)");
+       printf("        [-d delay] (writer period (us))\n");
+       printf("        [-c duration] (reader C.S. duration (in loops))\n");
+       printf("        [-e duration] (writer C.S. duration (in loops))\n");
+       printf("        [-v] (verbose output)\n");
+       printf("        [-a cpu#] [-a cpu#]... (affinity)\n");
        printf("\n");
 }
 

diff --git a/tests/test_urcu.c b/tests/test_urcu.c
index 5059ddeac51648b5f901cdb5c3a1483aac7a1480..f77a2b5de264077a558e46c08cce5de8e82f0f8e 100644 (file)
--- a/tests/test_urcu.c
+++ b/tests/test_urcu.c
@@ -266,15 +266,17 @@ void *thr_writer(void *_count)
 
 void show_usage(int argc, char **argv)
 {
-       printf("Usage : %s nr_readers nr_writers duration (s)", argv[0]);
+       printf("Usage : %s nr_readers nr_writers duration (s) <OPTIONS>\n",
+               argv[0]);
+       printf("OPTIONS:\n");
 #ifdef DEBUG_YIELD
-       printf(" [-r] [-w] (yield reader and/or writer)");
+       printf("        [-r] [-w] (yield reader and/or writer)\n");
 #endif
-       printf(" [-d delay] (writer period (us))");
-       printf(" [-c duration] (reader C.S. duration (in loops))");
-       printf(" [-e duration] (writer C.S. duration (in loops))");
-       printf(" [-v] (verbose output)");
-       printf(" [-a cpu#] [-a cpu#]... (affinity)");
+       printf("        [-d delay] (writer period (us))\n");
+       printf("        [-c duration] (reader C.S. duration (in loops))\n");
+       printf("        [-e duration] (writer C.S. duration (in loops))\n");
+       printf("        [-v] (verbose output)\n");
+       printf("        [-a cpu#] [-a cpu#]... (affinity)\n");
        printf("\n");
 }
 

diff --git a/tests/test_urcu_assign.c b/tests/test_urcu_assign.c
index fa4afbfc0eab7dca8ae06bf3f19e528e5767bdcf..62cb5f4d201b76846f1b08db5b8bf4fd7352d952 100644 (file)
--- a/tests/test_urcu_assign.c
+++ b/tests/test_urcu_assign.c
@@ -299,15 +299,17 @@ void *thr_writer(void *_count)
 
 void show_usage(int argc, char **argv)
 {
-       printf("Usage : %s nr_readers nr_writers duration (s)", argv[0]);
+       printf("Usage : %s nr_readers nr_writers duration (s) <OPTIONS>\n",
+               argv[0]);
+       printf("OPTIONS:\n");
 #ifdef DEBUG_YIELD
-       printf(" [-r] [-w] (yield reader and/or writer)");
+       printf("        [-r] [-w] (yield reader and/or writer)\n");
 #endif
-       printf(" [-d delay] (writer period (us))");
-       printf(" [-c duration] (reader C.S. duration (in loops))");
-       printf(" [-e duration] (writer C.S. duration (in loops))");
-       printf(" [-v] (verbose output)");
-       printf(" [-a cpu#] [-a cpu#]... (affinity)");
+       printf("        [-d delay] (writer period (us))\n");
+       printf("        [-c duration] (reader C.S. duration (in loops))\n");
+       printf("        [-e duration] (writer C.S. duration (in loops))\n");
+       printf("        [-v] (verbose output)\n");
+       printf("        [-a cpu#] [-a cpu#]... (affinity)\n");
        printf("\n");
 }
 

diff --git a/tests/test_urcu_bp.c b/tests/test_urcu_bp.c
index 1926fbb2de9e81bfcc53dc62aa5be8375fe6d5e1..b59f16dc08e82fe8b8ed5b719a1c28272700fcda 100644 (file)
--- a/tests/test_urcu_bp.c
+++ b/tests/test_urcu_bp.c
@@ -261,15 +261,17 @@ void *thr_writer(void *_count)
 
 void show_usage(int argc, char **argv)
 {
-       printf("Usage : %s nr_readers nr_writers duration (s)", argv[0]);
+       printf("Usage : %s nr_readers nr_writers duration (s) <OPTIONS>\n",
+               argv[0]);
+       printf("OPTIONS:\n");
 #ifdef DEBUG_YIELD
-       printf(" [-r] [-w] (yield reader and/or writer)");
+       printf("        [-r] [-w] (yield reader and/or writer)\n");
 #endif
-       printf(" [-d delay] (writer period (us))");
-       printf(" [-c duration] (reader C.S. duration (in loops))");
-       printf(" [-e duration] (writer C.S. duration (in loops))");
-       printf(" [-v] (verbose output)");
-       printf(" [-a cpu#] [-a cpu#]... (affinity)");
+       printf("        [-d delay] (writer period (us))\n");
+       printf("        [-c duration] (reader C.S. duration (in loops))\n");
+       printf("        [-e duration] (writer C.S. duration (in loops))\n");
+       printf("        [-v] (verbose output)\n");
+       printf("        [-a cpu#] [-a cpu#]... (affinity)\n");
        printf("\n");
 }
 

diff --git a/tests/test_urcu_defer.c b/tests/test_urcu_defer.c
index 9fea8c1f419bd9ff76f3d75d3464296b86d5481a..8a6adebb893d955911c42bc76e5860db9fd0035d 100644 (file)
--- a/tests/test_urcu_defer.c
+++ b/tests/test_urcu_defer.c
@@ -288,15 +288,17 @@ void *thr_writer(void *data)
 
 void show_usage(int argc, char **argv)
 {
-       printf("Usage : %s nr_readers nr_writers duration (s)", argv[0]);
+       printf("Usage : %s nr_readers nr_writers duration (s) <OPTIONS>\n",
+               argv[0]);
+       printf("OPTIONS:\n");
 #ifdef DEBUG_YIELD
-       printf(" [-r] [-w] (yield reader and/or writer)");
+       printf("        [-r] [-w] (yield reader and/or writer)\n");
 #endif
-       printf(" [-d delay] (writer period (us))");
-       printf(" [-c duration] (reader C.S. duration (in loops))");
-       printf(" [-e duration] (writer C.S. duration (in loops))");
-       printf(" [-v] (verbose output)");
-       printf(" [-a cpu#] [-a cpu#]... (affinity)");
+       printf("        [-d delay] (writer period (us))\n");
+       printf("        [-c duration] (reader C.S. duration (in loops))\n");
+       printf("        [-e duration] (writer C.S. duration (in loops))\n");
+       printf("        [-v] (verbose output)\n");
+       printf("        [-a cpu#] [-a cpu#]... (affinity)\n");
        printf("\n");
 }
 

diff --git a/tests/test_urcu_gc.c b/tests/test_urcu_gc.c
index c452afbd1f2e92a7186a07fcb4ef01dba1310671..da17a212dae00490c1336994dedae7369c2ed999 100644 (file)
--- a/tests/test_urcu_gc.c
+++ b/tests/test_urcu_gc.c
@@ -309,15 +309,17 @@ void *thr_writer(void *data)
 
 void show_usage(int argc, char **argv)
 {
-       printf("Usage : %s nr_readers nr_writers duration (s)", argv[0]);
+       printf("Usage : %s nr_readers nr_writers duration (s) <OPTIONS>\n",
+               argv[0]);
+       printf("OPTIONS:\n");
 #ifdef DEBUG_YIELD
-       printf(" [-r] [-w] (yield reader and/or writer)");
+       printf("        [-r] [-w] (yield reader and/or writer)\n");
 #endif
-       printf(" [-d delay] (writer period (us))");
-       printf(" [-c duration] (reader C.S. duration (in loops))");
-       printf(" [-e duration] (writer C.S. duration (in loops))");
-       printf(" [-v] (verbose output)");
-       printf(" [-a cpu#] [-a cpu#]... (affinity)");
+       printf("        [-d delay] (writer period (us))\n");
+       printf("        [-c duration] (reader C.S. duration (in loops))\n");
+       printf("        [-e duration] (writer C.S. duration (in loops))\n");
+       printf("        [-v] (verbose output)\n");
+       printf("        [-a cpu#] [-a cpu#]... (affinity)\n");
        printf("\n");
 }
 

diff --git a/tests/test_urcu_hash.c b/tests/test_urcu_hash.c
index 514d0bcdcf20496805ef3fc97c90f3f51b6acb5a..c4c11924549ba1ab5b3ed7332e65610f8e114106 100644 (file)
--- a/tests/test_urcu_hash.c
+++ b/tests/test_urcu_hash.c
@@ -267,7 +267,9 @@ void test_delete_all_nodes(struct cds_lfht *ht)
 
 void show_usage(int argc, char **argv)
 {
-       printf("Usage : %s nr_readers nr_writers duration (s)\n", argv[0]);
+       printf("Usage : %s nr_readers nr_writers duration (s) <OPTIONS>\n",
+               argv[0]);
+       printf("OPTIONS:\n");
 #ifdef DEBUG_YIELD
        printf("        [-r] [-w] (yield reader and/or writer)\n");
 #endif
@@ -291,10 +293,12 @@ printf("        [not -u nor -s] Add entries (supports redundant keys).\n");
        printf("        [-M size] Lookup pool size.\n");
        printf("        [-N size] Write pool size.\n");
        printf("        [-O size] Init pool size.\n");
-       printf("        [-V] Validate lookups of init values (use with filled init pool, same lookup range, with different write range).\n");
+       printf("        [-V] Validate lookups of init values.\n");
+       printf("                (use with filled init pool, same lookup range,\n");
+       printf("                with different write range)\n");
        printf("        [-U] Uniqueness test.\n");
        printf("        [-C] Number of hash chains.\n");
-       printf("\n\n");
+       printf("\n");
 }
 
 int main(int argc, char **argv)

diff --git a/tests/test_urcu_lfq.c b/tests/test_urcu_lfq.c
index 9d6535c78908c0e0cc6cb8da0ea14d13a520cc12..6d0f41a62bedaf2b859815903f0cd303bbdef450 100644 (file)
--- a/tests/test_urcu_lfq.c
+++ b/tests/test_urcu_lfq.c
@@ -283,11 +283,13 @@ void test_end(struct cds_lfq_queue_rcu *q, unsigned long long *nr_dequeues)
 
 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("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("\n");
 }
 

diff --git a/tests/test_urcu_lfs.c b/tests/test_urcu_lfs.c
index 45ed0628fc3dc5073fe10329319ed6860aa4133b..67ccaa25f3f9911e77acbc22d62f43ba6d84ed1c 100644 (file)
--- a/tests/test_urcu_lfs.c
+++ b/tests/test_urcu_lfs.c
@@ -343,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");
 }
 

diff --git a/tests/test_urcu_lfs_rcu.c b/tests/test_urcu_lfs_rcu.c
index b6d830c28e0be6e2e031ca2234f86070d9231c91..f8e793eb48271c9aaa4a8412cb9b636d17a9ed39 100644 (file)
--- a/tests/test_urcu_lfs_rcu.c
+++ b/tests/test_urcu_lfs_rcu.c
@@ -284,11 +284,13 @@ void test_end(struct cds_lfs_stack_rcu *s, unsigned long long *nr_dequeues)
 
 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("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("\n");
 }
 

diff --git a/tests/test_urcu_qsbr.c b/tests/test_urcu_qsbr.c
index f98e2735ef2004b911a78b1def6da07c694ca028..1bade60fd53dddc01a2c963c413254673074abbb 100644 (file)
--- a/tests/test_urcu_qsbr.c
+++ b/tests/test_urcu_qsbr.c
@@ -272,15 +272,17 @@ void *thr_writer(void *_count)
 
 void show_usage(int argc, char **argv)
 {
-       printf("Usage : %s nr_readers nr_writers duration (s)", argv[0]);
+       printf("Usage : %s nr_readers nr_writers duration (s) <OPTIONS>\n",
+               argv[0]);
+       printf("OPTIONS:\n");
 #ifdef DEBUG_YIELD
-       printf(" [-r] [-w] (yield reader and/or writer)");
+       printf("        [-r] [-w] (yield reader and/or writer)\n");
 #endif
-       printf(" [-d delay] (writer period (us))");
-       printf(" [-c duration] (reader C.S. duration (in loops))");
-       printf(" [-e duration] (writer C.S. duration (in loops))");
-       printf(" [-v] (verbose output)");
-       printf(" [-a cpu#] [-a cpu#]... (affinity)");
+       printf("        [-d delay] (writer period (us))\n");
+       printf("        [-c duration] (reader C.S. duration (in loops))\n");
+       printf("        [-e duration] (writer C.S. duration (in loops))\n");
+       printf("        [-v] (verbose output)\n");
+       printf("        [-a cpu#] [-a cpu#]... (affinity)\n");
        printf("\n");
 }
 

diff --git a/tests/test_urcu_qsbr_gc.c b/tests/test_urcu_qsbr_gc.c
index ed7d5962e02e857f62e409b3691fa1c5212b8b05..34d0a1791dff2030000ca3eb48b475092da97fa2 100644 (file)
--- a/tests/test_urcu_qsbr_gc.c
+++ b/tests/test_urcu_qsbr_gc.c
@@ -308,16 +308,18 @@ void *thr_writer(void *data)
 
 void show_usage(int argc, char **argv)
 {
-       printf("Usage : %s nr_readers nr_writers duration (s)", argv[0]);
+       printf("Usage : %s nr_readers nr_writers duration (s) <OPTIONS>\n",
+               argv[0]);
+       printf("OPTIONS:\n");
 #ifdef DEBUG_YIELD
-       printf(" [-r] [-w] (yield reader and/or writer)");
+       printf("        [-r] [-w] (yield reader and/or writer)\n");
 #endif
-       printf(" [-b batch] (batch reclaim)");
-       printf(" [-d delay] (writer period (us))");
-       printf(" [-c duration] (reader C.S. duration (in loops))");
-       printf(" [-e duration] (writer C.S. duration (in loops))");
-       printf(" [-v] (verbose output)");
-       printf(" [-a cpu#] [-a cpu#]... (affinity)");
+       printf("        [-b batch] (batch reclaim)\n");
+       printf("        [-d delay] (writer period (us))\n");
+       printf("        [-c duration] (reader C.S. duration (in loops))\n");
+       printf("        [-e duration] (writer C.S. duration (in loops))\n");
+       printf("        [-v] (verbose output)\n");
+       printf("        [-a cpu#] [-a cpu#]... (affinity)\n");
        printf("\n");
 }
 

diff --git a/tests/test_urcu_wfcq.c b/tests/test_urcu_wfcq.c
index 6af02405b954b57eb66be5388eadd857d2cfad4f..cb1cc23ed91aa575ea9667a4594ec9269dc3b1b6 100644 (file)
--- a/tests/test_urcu_wfcq.c
+++ b/tests/test_urcu_wfcq.c
@@ -351,17 +351,19 @@ static void test_end(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(" [-q] (test dequeue)");
-       printf(" [-s] (test splice, enabled by default)");
-       printf(" [-M] (use mutex external synchronization)");
-       printf("      Note: default: no external synchronization used.");
-       printf(" [-f] (force user-provided synchronization)");
-       printf(" [-w] Wait for dequeuer to empty queue");
+       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("        [-q] (test dequeue)\n");
+       printf("        [-s] (test splice, enabled by default)\n");
+       printf("        [-M] (use mutex external synchronization)\n");
+       printf("                Note: default: no external synchronization used.\n");
+       printf("        [-f] (force user-provided synchronization)\n");
+       printf("        [-w] Wait for dequeuer to empty queue\n");
        printf("\n");
 }
 

diff --git a/tests/test_urcu_wfq.c b/tests/test_urcu_wfq.c
index f26708baf3602816c7fae44a486c3f68ea352d7b..0940224ecbae653a00f8e83e16f8c7f17441a326 100644 (file)
--- a/tests/test_urcu_wfq.c
+++ b/tests/test_urcu_wfq.c
@@ -255,11 +255,13 @@ void test_end(struct cds_wfq_queue *q, unsigned long long *nr_dequeues)
 
 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("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("\n");
 }
 

diff --git a/tests/test_urcu_wfs.c b/tests/test_urcu_wfs.c
index 338954faeb351f777591e062493cef67397371a7..a379fa39176c9453f1249748da21409b08e4c92f 100644 (file)
--- a/tests/test_urcu_wfs.c
+++ b/tests/test_urcu_wfs.c
@@ -339,17 +339,19 @@ static void test_end(struct cds_wfs_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(" [-M] (use mutex external synchronization)");
-       printf("      Note: default: no external synchronization used.");
-       printf(" [-f] (force user-provided synchronization)");
-       printf(" [-w] Wait for dequeuer to empty stack");
+       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("        [-M] (use mutex external synchronization)\n");
+       printf("                Note: default: no external synchronization used.\n");
+       printf("        [-f] (force user-provided synchronization)\n");
+       printf("        [-w] Wait for dequeuer to empty stack\n");
        printf("\n");
 }