diff options
author | Carsten Emde <C.Emde@osadl.org> | 2010-03-07 21:48:01 +0100 |
---|---|---|
committer | John Kacur <jkacur@redhat.com> | 2010-03-08 13:40:10 +0100 |
commit | cd34b8b1728a5eaab9a1926fc42383f73e42f2f8 (patch) | |
tree | 33baf783d45aed187d93f27ca3a59f13ed505856 | |
parent | f02c5d5ad010ba3a5bdf54d400bbe4b7a81101bd (diff) | |
download | rt-tests-cd34b8b1728a5eaab9a1926fc42383f73e42f2f8.tar.gz |
add-smp-option-to-ptsematest.patch
Add SMP testing option (-S, --smp) to ptsematest, same as in
cyclictest.
Signed-off-by: Carsten Emde <C.Emde@osadl.org>
Acked-by: John Kacur <jkacur@redhat.com>
-rw-r--r-- | src/ptsematest/ptsematest.c | 25 |
1 files changed, 23 insertions, 2 deletions
diff --git a/src/ptsematest/ptsematest.c b/src/ptsematest/ptsematest.c index 2683a2e..14c3f81 100644 --- a/src/ptsematest/ptsematest.c +++ b/src/ptsematest/ptsematest.c @@ -173,6 +173,8 @@ static void display_help(void) "-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" + "-S --smp SMP testing: options -a -t and same priority\n" + " of all threads\n" "-t --threads one thread per available processor\n" "-t [NUM] --threads=NUM number of threads:\n" " without NUM, threads = max_cpus\n" @@ -189,6 +191,8 @@ static int num_threads = 1; static int max_cycles; static int interval = 1000; static int distance = 500; +static int smp; +static int sameprio; static void process_options (int argc, char *argv[]) { @@ -205,16 +209,21 @@ static void process_options (int argc, char *argv[]) {"interval", required_argument, NULL, 'i'}, {"loops", required_argument, NULL, 'l'}, {"priority", required_argument, NULL, 'p'}, + {"smp", no_argument, NULL, 'S'}, {"threads", optional_argument, NULL, 't'}, {"help", no_argument, NULL, '?'}, {NULL, 0, NULL, 0} }; - int c = getopt_long (argc, argv, "a::b:d:i:l:p:t::", + int c = getopt_long (argc, argv, "a::b:d:i:l:p:St::", long_options, &option_index); if (c == -1) break; switch (c) { case 'a': + if (smp) { + warn("-a ignored due to --smp\n"); + break; + } if (optarg != NULL) { affinity = atoi(optarg); setaffinity = AFFINITY_SPECIFIED; @@ -230,7 +239,16 @@ static void process_options (int argc, char *argv[]) case 'i': interval = atoi(optarg); break; case 'l': max_cycles = atoi(optarg); break; case 'p': priority = atoi(optarg); break; + case 'S': + smp = 1; + num_threads = max_cpus; + setaffinity = AFFINITY_USEALL; + break; case 't': + if (smp) { + warn("-t ignored due to --smp\n"); + break; + } if (optarg != NULL) num_threads = atoi(optarg); else if (optind<argc && atoi(argv[optind])) @@ -261,6 +279,9 @@ static void process_options (int argc, char *argv[]) if (num_threads < 1) error = 1; + if (priority && smp) + sameprio = 1; + if (error) display_help (); } @@ -327,7 +348,7 @@ int main(int argc, char *argv[]) } receiver[i].priority = priority; receiver[i].tracelimit = tracelimit; - if (priority > 0) + if (priority > 1 && !sameprio) priority--; receiver[i].delay.tv_sec = interval / USEC_PER_SEC; receiver[i].delay.tv_nsec = (interval % USEC_PER_SEC) * 1000; |