From: Daniel Wagner <dwagner@suse.de>
To: Clark Williams <williams@redhat.com>, John Kacur <jkacur@redhat.com>
Cc: linux-rt-users@vger.kernel.org, Daniel Wagner <dwagner@suse.de>
Subject: [rt-tests v2 15/18] sigwaittest: Streamline usage and man page
Date: Wed, 7 Oct 2020 10:56:50 +0200 [thread overview]
Message-ID: <20201007085653.11961-16-dwagner@suse.de> (raw)
In-Reply-To: <20201007085653.11961-1-dwagner@suse.de>
Signed-off-by: Daniel Wagner <dwagner@suse.de>
---
src/sigwaittest/sigwaittest.8 | 4 +-
src/sigwaittest/sigwaittest.c | 76 +++++++++++++++++++----------------
2 files changed, 44 insertions(+), 36 deletions(-)
diff --git a/src/sigwaittest/sigwaittest.8 b/src/sigwaittest/sigwaittest.8
index 2be9c03d05ca..a2dc1bc080a3 100644
--- a/src/sigwaittest/sigwaittest.8
+++ b/src/sigwaittest/sigwaittest.8
@@ -4,7 +4,7 @@
\fBsigwaittest\fR \- Start two threads or fork two processes and measure the latency between sending and receiving a signal
.SH "SYNTAX"
.LP
-sigwaittest [-a|-a PROC] [-b USEC] [-d DIST] [-f] [-i INTV] [-l loops] [-p PRIO] [-t|-t NUM]
+sigwaittest [-a|--affinity PROC] [-b|--breaktrace USEC] [-d|--distance DIST] [-D|--duration TIME] [-f|--fork [OPT]] [-i|--interval INTV] [-l|--loops LOOPS] [-p|--prio PRIO] [-t|--threads [NUM]]
.br
.SH "DESCRIPTION"
.LP
@@ -26,7 +26,7 @@ Specify a length for the test run.
.br
Append 'm', 'h', or 'd' to specify minutes, hours or days.
.TP
-.B \-f, \-\-fork
+.B \-f, \-\-fork[=OPT]
Instead of creating threads (which is the default), fork new processes
.TP
.B \-i, \-\-interval=INTV
diff --git a/src/sigwaittest/sigwaittest.c b/src/sigwaittest/sigwaittest.c
index e7393f791519..12b55e901ce5 100644
--- a/src/sigwaittest/sigwaittest.c
+++ b/src/sigwaittest/sigwaittest.c
@@ -206,28 +206,30 @@ void *semathread(void *param)
}
-static void display_help(void)
+static void display_help(int error)
{
printf("sigwaittest V %1.2f\n", VERSION);
- puts("Usage: sigwaittest <options>");
- puts("Function: test sigwait() latency");
- puts(
- "Options:\n"
- "-a [NUM] --affinity run thread #N on processor #N, if possible\n"
- " with NUM pin all threads to the processor NUM\n"
- "-b USEC --breaktrace=USEC send break trace command when latency > USEC\n"
- "-d DIST --distance=DIST distance of thread intervals in us default=500\n"
- "-f --fork fork new processes instead of creating threads\n"
- "-i INTV --interval=INTV base interval of thread in us default=1000\n"
- "-l LOOPS --loops=LOOPS number of loops: default=0(endless)\n"
- "-D --duration=TIME specify a length for the test run.\n"
- " Append 'm', 'h', or 'd' to specify minutes, hours or days.\n"
- "-p PRIO --prio=PRIO priority\n"
- "-t --threads one thread per available processor\n"
- "-t [NUM] --threads=NUM number of threads:\n"
- " without NUM, threads = max_cpus\n"
- " without -t default = 1\n");
- exit(1);
+ printf("Usage:\n"
+ "sigwaittest <options>\n\n"
+ "Function: test sigwait() latency\n\n"
+ "Available options:\n"
+ "-a [NUM] --affinity run thread #N on processor #N, if possible\n"
+ " with NUM pin all threads to the processor NUM\n"
+ "-b USEC --breaktrace=USEC send break trace command when latency > USEC\n"
+ "-d DIST --distance=DIST distance of thread intervals in us default=500\n"
+ "-D --duration=TIME specify a length for the test run.\n"
+ " Append 'm', 'h', or 'd' to specify minutes, hours or\n"
+ " days.\n"
+ "-f [OPT] --fork[=OPT] fork new processes instead of creating threads\n"
+ "-i INTV --interval=INTV base interval of thread in us default=1000\n"
+ "-l LOOPS --loops=LOOPS number of loops: default=0(endless)\n"
+ "-p PRIO --prio=PRIO priority\n"
+ "-t --threads one thread per available processor\n"
+ "-t [NUM] --threads=NUM number of threads:\n"
+ " without NUM, threads = max_cpus\n"
+ " without -t default = 1\n"
+ );
+ exit(error);
}
@@ -250,19 +252,19 @@ static void process_options (int argc, char *argv[])
int option_index = 0;
/** Options for getopt */
static struct option long_options[] = {
- {"affinity", optional_argument, NULL, 'a'},
- {"breaktrace", required_argument, NULL, 'b'},
- {"distance", required_argument, NULL, 'd'},
- {"fork", optional_argument, NULL, 'f'},
- {"interval", required_argument, NULL, 'i'},
- {"loops", required_argument, NULL, 'l'},
- {"duration", required_argument, NULL, 'D'},
- {"priority", required_argument, NULL, 'p'},
- {"threads", optional_argument, NULL, 't'},
- {"help", no_argument, NULL, '?'},
+ {"affinity", optional_argument, NULL, 'a'},
+ {"breaktrace", required_argument, NULL, 'b'},
+ {"distance", required_argument, NULL, 'd'},
+ {"duration", required_argument, NULL, 'D'},
+ {"fork", optional_argument, NULL, 'f'},
+ {"help", no_argument, NULL, 'h'},
+ {"interval", required_argument, NULL, 'i'},
+ {"loops", required_argument, NULL, 'l'},
+ {"priority", required_argument, NULL, 'p'},
+ {"threads", optional_argument, NULL, 't'},
{NULL, 0, NULL, 0}
};
- int c = getopt_long (argc, argv, "a::b:d:f::i:l:D:p:t::",
+ int c = getopt_long (argc, argv, "a::b:d:D:f::hi:l:p:t::",
long_options, &option_index);
if (c == -1)
break;
@@ -280,6 +282,7 @@ static void process_options (int argc, char *argv[])
break;
case 'b': thistracelimit = atoi(optarg); break;
case 'd': distance = atoi(optarg); break;
+ case 'D': duration = parse_time_string(optarg); break;
case 'f':
if (optarg != NULL) {
wasforked = 1;
@@ -291,9 +294,12 @@ static void process_options (int argc, char *argv[])
} else
mustfork = 1;
break;
+ case '?':
+ case 'h':
+ display_help(0);
+ break;
case 'i': interval = atoi(optarg); break;
case 'l': max_cycles = atoi(optarg); break;
- case 'D': duration = parse_time_string(optarg); break;
case 'p': priority = atoi(optarg); break;
case 't':
if (optarg != NULL)
@@ -303,7 +309,9 @@ static void process_options (int argc, char *argv[])
else
num_threads = max_cpus;
break;
- case '?': error = 1; break;
+ default:
+ display_help(1);
+ break;
}
}
@@ -331,7 +339,7 @@ static void process_options (int argc, char *argv[])
tracelimit = thistracelimit;
}
if (error)
- display_help ();
+ display_help (error);
}
--
2.28.0
next prev parent reply other threads:[~2020-10-07 8:57 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-07 8:56 [rt-tests v2 00/18] Streamline command line Daniel Wagner
2020-10-07 8:56 ` [rt-tests v2 01/18] rt-util: Move parse_cpumask from cyclictest Daniel Wagner
2020-10-23 15:46 ` John Kacur
2020-10-26 18:34 ` Daniel Wagner
2020-10-29 15:45 ` John Kacur
2020-10-07 8:56 ` [rt-tests v2 02/18] cyclictest: Use numa library helpers in get_available_cpus() Daniel Wagner
2020-10-23 15:55 ` John Kacur
2020-10-07 8:56 ` [rt-tests v2 03/18] cyclicdeadline: Streamline usage output and man page Daniel Wagner
2020-10-23 16:01 ` John Kacur
2020-10-07 8:56 ` [rt-tests v2 04/18] cyclicdeadline: Add long command line options Daniel Wagner
2020-10-23 16:07 ` John Kacur
2020-10-27 8:07 ` Daniel Wagner
2020-10-07 8:56 ` [rt-tests v2 05/18] deadline_test: Streamline usage output and man page Daniel Wagner
2020-10-23 16:10 ` John Kacur
2020-10-07 8:56 ` [rt-tests v2 06/18] oslat: " Daniel Wagner
2020-10-23 17:19 ` John Kacur
2020-10-07 8:56 ` [rt-tests v2 07/18] oslat: Use string parser utilies Daniel Wagner
2020-10-23 17:25 ` John Kacur
2020-10-27 8:09 ` Daniel Wagner
2020-10-07 8:56 ` [rt-tests v2 08/18] pip_stress: Add command line parser Daniel Wagner
2020-10-23 17:33 ` John Kacur
2020-10-27 8:09 ` Daniel Wagner
2020-10-07 8:56 ` [rt-tests v2 09/18] pi_stress: Streamline usage output and man page Daniel Wagner
2020-10-07 8:56 ` [rt-tests v2 10/18] pmqtest: " Daniel Wagner
2020-10-23 18:18 ` John Kacur
2020-10-23 18:23 ` John Kacur
2020-10-07 8:56 ` [rt-tests v2 11/18] ptsematest: " Daniel Wagner
2020-10-23 18:25 ` John Kacur
2021-02-10 16:08 ` Peter Xu
2021-02-10 16:25 ` Peter Xu
2021-02-10 16:30 ` Daniel Wagner
2021-02-10 16:33 ` Peter Xu
2021-02-10 16:35 ` Daniel Wagner
2021-02-10 17:00 ` Peter Xu
2021-02-10 17:24 ` Daniel Wagner
2020-10-07 8:56 ` [rt-tests v2 12/18] queuelat: Streamline usage " Daniel Wagner
2020-10-23 18:40 ` John Kacur
2020-10-07 8:56 ` [rt-tests v2 13/18] rt-migrate-test: " Daniel Wagner
2020-10-23 18:47 ` John Kacur
2020-10-07 8:56 ` [rt-tests v2 14/18] signaltest: " Daniel Wagner
2020-10-23 18:50 ` John Kacur
2020-10-07 8:56 ` Daniel Wagner [this message]
2020-10-23 18:51 ` [rt-tests v2 15/18] sigwaittest: " John Kacur
2020-10-07 8:56 ` [rt-tests v2 16/18] ssdd: " Daniel Wagner
2020-10-23 18:57 ` John Kacur
2020-10-07 8:56 ` [rt-tests v2 17/18] svsematest: " Daniel Wagner
2020-10-23 18:59 ` John Kacur
2020-10-07 8:56 ` [rt-tests v2 18/18] hackbench: " Daniel Wagner
2020-10-23 19:03 ` John Kacur
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201007085653.11961-16-dwagner@suse.de \
--to=dwagner@suse.de \
--cc=jkacur@redhat.com \
--cc=linux-rt-users@vger.kernel.org \
--cc=williams@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).