The quiet option is useful for automated test setups where
only the final result of the run is interesting. This avoids
to fill up the logs.
Signed-off-by: Daniel Wagner <dwagner@xxxxxxx>
---
src/ptsematest/ptsematest.8 | 5 ++++-
src/ptsematest/ptsematest.c | 20 ++++++++++++++++----
2 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/src/ptsematest/ptsematest.8 b/src/ptsematest/ptsematest.8
index 05a0cdfd3657..a435e7a6221c 100644
--- a/src/ptsematest/ptsematest.8
+++ b/src/ptsematest/ptsematest.8
@@ -4,7 +4,7 @@
\fBptsematest\fR \- Start two threads and measure the latency of interprocess communication with POSIX mutex.
.SH "SYNOPSIS"
.LP
-ptsematest [-a|--affinity [PROC]] [-b|--breaktrace USEC] [-d|--distance DIST] [-D|--duration TIME] [-h|--help] [-i|--interval INTV] [-l|--loops LOOPS] [-p|--prio PRIO] [-S|--smp] [-t|--threads [NUM]]
+ptsematest [-a|--affinity [PROC]] [-b|--breaktrace USEC] [-d|--distance DIST] [-D|--duration TIME] [-h|--help] [-i|--interval INTV] [-l|--loops LOOPS] [-p|--prio PRIO] [-q|--quiet] [-S|--smp] [-t|--threads [NUM]]
.br
.SH "DESCRIPTION"
.LP
@@ -38,6 +38,9 @@ Set the number of loops. The default is 0 (endless). This option is useful for a
.B \-p, \-\-prio=PRIO
Set the priority of the process.
.TP
+.B \-q, \-\-quiet
+Print a summary only on exit. Useful for automated tests, where only the summary output needs to be captured.
+.TP
.B \-S, \-\-smp
SMP testing: options -a -t and same priority
.TP
diff --git a/src/ptsematest/ptsematest.c b/src/ptsematest/ptsematest.c
index 69b4e1221361..2e392299fdc4 100644
--- a/src/ptsematest/ptsematest.c
+++ b/src/ptsematest/ptsematest.c
@@ -156,6 +156,7 @@ static void display_help(int error)
"-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"
+ "-q --quiet print a summary only on exit\n"
"-S --smp SMP testing: options -a -t and same priority\n"
" of all threads\n"
"-t --threads one thread per available processor\n"
@@ -178,6 +179,7 @@ static int interval = 1000;
static int distance = 500;
static int smp;
static int sameprio;
+static int quiet;
static void process_options(int argc, char *argv[])
{
@@ -196,11 +198,12 @@ static void process_options(int argc, char *argv[])
{"interval", required_argument, NULL, 'i'},
{"loops", required_argument, NULL, 'l'},
{"priority", required_argument, NULL, 'p'},
+ {"quiet", no_argument , NULL, 'q'},
{"smp", no_argument, NULL, 'S'},
{"threads", optional_argument, NULL, 't'},
{NULL, 0, NULL, 0}
};
- int c = getopt_long (argc, argv, "a::b:d:i:l:D:p:St::h",
+ int c = getopt_long (argc, argv, "a::b:d:i:l:D:p:qSt::h",
long_options, &option_index);
if (c == -1)
break;
@@ -228,6 +231,7 @@ static void process_options(int argc, char *argv[])
case 'h': display_help(0); break;
case 'l': max_cycles = atoi(optarg); break;
case 'p': priority = atoi(optarg); break;
+ case 'q': quiet = 1; break;
case 'S':
smp = 1;
num_threads = max_cpus;
@@ -293,6 +297,9 @@ static void print_stat(FILE *fp, struct params *receiver, struct params *sender,
{
int i;
+ if (quiet)
+ return;
+
for (i = 0; i < num_threads; i++) {
printf("#%1d: ID%d, P%d, CPU%d, I%ld; #%1d: ID%d, P%d, CPU%d, Cycles %d\n",
i*2, receiver[i].tid, receiver[i].priority, receiver[i].cpu,
@@ -391,8 +398,9 @@ int main(int argc, char *argv[])
shutdown |= receiver[i].shutdown | sender[i].shutdown;
if (receiver[0].samples > oldsamples || shutdown) {
- print_stat(stdout, receiver, sender, 0, 0);
- printf("\033[%dA", num_threads*2);
+ print_stat(stdout, receiver, sender, 0, quiet);
+ if (!quiet)
+ printf("\033[%dA", num_threads*2);
}
sigemptyset(&sigset);
@@ -405,7 +413,11 @@ int main(int argc, char *argv[])
sigemptyset(&sigset);
pthread_sigmask(SIG_SETMASK, &sigset, NULL);
}
- printf("\033[%dB", num_threads*2 + 2);
+
+ if (!quiet)
+ printf("\033[%dB", num_threads*2 + 2);
+ else
+ print_stat(stdout, receiver, sender, 0, 0);
for (i = 0; i < num_threads; i++) {
receiver[i].shutdown = 1;
--
2.29.2
