summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Wagner <wagi@monom.org>2019-06-05 17:14:35 +0200
committerJohn Kacur <jkacur@redhat.com>2019-06-19 01:04:58 +0200
commit96bd8df1aaa840faaabc15e80503fd54356ad469 (patch)
tree3995cdb5c37d54c0b9b856dba1cb1fcb31b186cb
parentf750e58986fea69b7ca4d33be34989ed5886b7ce (diff)
downloadrt-tests-96bd8df1aaa840faaabc15e80503fd54356ad469.tar.gz
rt-tests-96bd8df1aaa840faaabc15e80503fd54356ad469.tar.xz
sigwaittest: Add duration command line argument
Many of the test programs have the --loop argument for automatic stopping. The main problem with the --loop argument is how long is --loop 1000? To simplify automated tests introduce a --duration argument which allows to set the time how long a test should run. This allows the test suite to define the execution time and also the timeout which a normal human can understand. For example run the test for 10 minutes and timeout at 11 minutes: # timeout 11m sigwaittest -D 10m Signed-off-by: Daniel Wagner <wagi@monom.org> -Fixed up some dos line endings in the man page changes Signed-off-by: John Kacur <jkacur@redhat.com>
-rw-r--r--src/sigwaittest/sigwaittest.8119
-rw-r--r--src/sigwaittest/sigwaittest.c15
2 files changed, 76 insertions, 58 deletions
diff --git a/src/sigwaittest/sigwaittest.8 b/src/sigwaittest/sigwaittest.8
index 2290ca2..2be9c03 100644
--- a/src/sigwaittest/sigwaittest.8
+++ b/src/sigwaittest/sigwaittest.8
@@ -1,57 +1,62 @@
-.TH "sigwaittest" "8" "0.1" "" ""
-.SH "NAME"
-.LP
-\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]
-.br
-.SH "DESCRIPTION"
-.LP
-The program \fBsigwaittest\fR starts two threads or, optionally, forks two processes that are synchronized via signals and measures the latency between sending a signal and returning from sigwait().
-.SH "OPTIONS"
-.TP
-.B \-a, \-\-affinity[=PROC]
-Run on processor number PROC. If PROC is not specified, run on current processor.
-.TP
-.B \-b, \-\-breaktrace=USEC
-Send break trace command when latency > USEC. This is a debugging option to control the latency tracer in the realtime preemption patch.
-It is useful to track down unexpected large latencies of a system.
-.TP
-.B \-d, \-\-distance=DIST
-Set the distance of thread intervals in microseconds (default is 500 us). When cyclictest is called with the -t option and more than one thread is created, then this distance value is added to the interval of the threads: Interval(thread N) = Interval(thread N-1) + DIST
-.TP
-.B \-f, \-\-fork
-Instead of creating threads (which is the default), fork new processes
-.TP
-.B \-i, \-\-interval=INTV
-Set the base interval of the thread(s) in microseconds (default is 1000 us). This sets the interval of the first thread. See also -d.
-.TP
-.B \-l, \-\-loops=LOOPS
-Set the number of loops. The default is 0 (endless). This option is useful for automated tests with a given number of test cycles. sigwaittest is stopped once the number of timer intervals has been reached.
-.TP
-.B \-p, \-\-prio=PRIO
-Set the priority of the process.
-.TP
-.B \-t, \-\-threads[=NUM]
-Set the number of test threads (default is 1, if this option is not given). If NUM is specified, create NUM test threads. If NUM is not specified, NUM is set to the number of available CPUs.
-.SH "EXAMPLES"
-The following example was running on a 4-way CPU:
-.LP
-.nf
-# sigwaittest -a -t -p99 -i100 -d25 -l1000000
-#0: ID11510, P99, CPU0, I100; #1: ID11511, P99, CPU0, Cycles 1000000
-#2: ID11512, P98, CPU1, I125; #3: ID11513, P98, CPU1, Cycles 817484
-#4: ID11514, P97, CPU2, I150; #5: ID11515, P97, CPU2, Cycles 668213
-#6: ID11516, P96, CPU3, I175; #7: ID11517, P96, CPU3, Cycles 597344
-#1 -> #0, Min 1, Cur 2, Avg 3, Max 30
-#3 -> #2, Min 1, Cur 26, Avg 3, Max 42
-#5 -> #4, Min 1, Cur 46, Avg 4, Max 67
-#7 -> #6, Min 1, Cur 2, Avg 3, Max 74
-.fi
-.SH "AUTHORS"
-.LP
-Carsten Emde <C.Emde@osadl.org>
-.SH "SEE ALSO"
-.LP
-kill(2), sigwait(3)
+.TH "sigwaittest" "8" "0.1" "" ""
+.SH "NAME"
+.LP
+\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]
+.br
+.SH "DESCRIPTION"
+.LP
+The program \fBsigwaittest\fR starts two threads or, optionally, forks two processes that are synchronized via signals and measures the latency between sending a signal and returning from sigwait().
+.SH "OPTIONS"
+.TP
+.B \-a, \-\-affinity[=PROC]
+Run on processor number PROC. If PROC is not specified, run on current processor.
+.TP
+.B \-b, \-\-breaktrace=USEC
+Send break trace command when latency > USEC. This is a debugging option to control the latency tracer in the realtime preemption patch.
+It is useful to track down unexpected large latencies of a system.
+.TP
+.B \-d, \-\-distance=DIST
+Set the distance of thread intervals in microseconds (default is 500 us). When cyclictest is called with the -t option and more than one thread is created, then this distance value is added to the interval of the threads: Interval(thread N) = Interval(thread N-1) + DIST
+.TP
+.B \-D, \-\-duration=TIME
+Specify a length for the test run.
+.br
+Append 'm', 'h', or 'd' to specify minutes, hours or days.
+.TP
+.B \-f, \-\-fork
+Instead of creating threads (which is the default), fork new processes
+.TP
+.B \-i, \-\-interval=INTV
+Set the base interval of the thread(s) in microseconds (default is 1000 us). This sets the interval of the first thread. See also -d.
+.TP
+.B \-l, \-\-loops=LOOPS
+Set the number of loops. The default is 0 (endless). This option is useful for automated tests with a given number of test cycles. sigwaittest is stopped once the number of timer intervals has been reached.
+.TP
+.B \-p, \-\-prio=PRIO
+Set the priority of the process.
+.TP
+.B \-t, \-\-threads[=NUM]
+Set the number of test threads (default is 1, if this option is not given). If NUM is specified, create NUM test threads. If NUM is not specified, NUM is set to the number of available CPUs.
+.SH "EXAMPLES"
+The following example was running on a 4-way CPU:
+.LP
+.nf
+# sigwaittest -a -t -p99 -i100 -d25 -l1000000
+#0: ID11510, P99, CPU0, I100; #1: ID11511, P99, CPU0, Cycles 1000000
+#2: ID11512, P98, CPU1, I125; #3: ID11513, P98, CPU1, Cycles 817484
+#4: ID11514, P97, CPU2, I150; #5: ID11515, P97, CPU2, Cycles 668213
+#6: ID11516, P96, CPU3, I175; #7: ID11517, P96, CPU3, Cycles 597344
+#1 -> #0, Min 1, Cur 2, Avg 3, Max 30
+#3 -> #2, Min 1, Cur 26, Avg 3, Max 42
+#5 -> #4, Min 1, Cur 46, Avg 4, Max 67
+#7 -> #6, Min 1, Cur 2, Avg 3, Max 74
+.fi
+.SH "AUTHORS"
+.LP
+Carsten Emde <C.Emde@osadl.org>
+.SH "SEE ALSO"
+.LP
+kill(2), sigwait(3)
diff --git a/src/sigwaittest/sigwaittest.c b/src/sigwaittest/sigwaittest.c
index 91fcdaa..6e3c283 100644
--- a/src/sigwaittest/sigwaittest.c
+++ b/src/sigwaittest/sigwaittest.c
@@ -222,6 +222,8 @@ static void display_help(void)
"-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"
@@ -236,6 +238,7 @@ static int affinity;
static int priority;
static int num_threads = 1;
static int max_cycles;
+static int duration;
static int interval = 1000;
static int distance = 500;
@@ -255,12 +258,13 @@ static void process_options (int argc, char *argv[])
{"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, '?'},
{NULL, 0, NULL, 0}
};
- int c = getopt_long (argc, argv, "a::b:d:f::i:l:p:t::",
+ int c = getopt_long (argc, argv, "a::b:d:f::i:l:D:p:t::",
long_options, &option_index);
if (c == -1)
break;
@@ -291,6 +295,7 @@ static void process_options (int argc, char *argv[])
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)
@@ -316,6 +321,9 @@ static void process_options (int argc, char *argv[])
}
}
+ if (duration < 0)
+ error = 1;
+
if (num_threads < 1 || num_threads > 255)
error = 1;
@@ -433,9 +441,13 @@ int main(int argc, char *argv[])
signal(SIGINT, sighand);
signal(SIGTERM, sighand);
+ signal(SIGALRM, sighand);
sigemptyset(&sigset);
pthread_sigmask(SIG_SETMASK, &sigset, NULL);
+ if (duration)
+ alarm(duration);
+
if (!mustfork && !wasforked) {
receiver = calloc(num_threads, sizeof(struct params));
sender = calloc(num_threads, sizeof(struct params));
@@ -578,6 +590,7 @@ int main(int argc, char *argv[])
sigemptyset(&sigset);
sigaddset(&sigset, SIGTERM);
sigaddset(&sigset, SIGINT);
+ sigaddset(&sigset, SIGALRM);
pthread_sigmask(SIG_SETMASK, &sigset, NULL);
nanosleep(&maindelay, NULL);