From patchwork Wed Oct 7 08:56:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Wagner X-Patchwork-Id: 268381 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C1FB6C4727E for ; Wed, 7 Oct 2020 08:57:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 77E762083B for ; Wed, 7 Oct 2020 08:57:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728045AbgJGI5F (ORCPT ); Wed, 7 Oct 2020 04:57:05 -0400 Received: from mx2.suse.de ([195.135.220.15]:57608 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728033AbgJGI5E (ORCPT ); Wed, 7 Oct 2020 04:57:04 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 58B3FB299; Wed, 7 Oct 2020 08:57:03 +0000 (UTC) From: Daniel Wagner To: Clark Williams , John Kacur Cc: linux-rt-users@vger.kernel.org, Daniel Wagner Subject: [rt-tests v2 17/18] svsematest: Streamline usage and man page Date: Wed, 7 Oct 2020 10:56:52 +0200 Message-Id: <20201007085653.11961-18-dwagner@suse.de> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201007085653.11961-1-dwagner@suse.de> References: <20201007085653.11961-1-dwagner@suse.de> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-rt-users@vger.kernel.org Signed-off-by: Daniel Wagner Signed-off-by: John Kacur --- src/svsematest/svsematest.8 | 6 +-- src/svsematest/svsematest.c | 83 +++++++++++++++++++------------------ 2 files changed, 46 insertions(+), 43 deletions(-) diff --git a/src/svsematest/svsematest.8 b/src/svsematest/svsematest.8 index 98322c105803..5fcb96149bdd 100644 --- a/src/svsematest/svsematest.8 +++ b/src/svsematest/svsematest.8 @@ -4,15 +4,15 @@ \fBsvsematest\fR \- Start two threads or fork two processes and measure the latency of SYSV semaphores .SH "SYNTAX" .LP -svsematest [-a|-a PROC] [-b USEC] [-d DIST] [-f] [-i INTV] [-l loops] [-p PRIO] [-t|-t NUM] +svsematest [-a|--affinity NUM] [-b|--breaktrace USEC] [-d|--distance DIST] [-D|--duration TIME] [-f|--fork [OPT]] [-i|--interval INTV] [-l|--loops LOOPS] [-p|--prio PRIO] [-S|--smp] [-t|--threads [NUM]] .br .SH "DESCRIPTION" .LP The program \fBsvsematest\fR starts two threads or, optionally, forks two processes that are synchronized via SYSV semaphores and measures the latency between releasing a semaphore on one side and getting it on the other side. .SH "OPTIONS" .TP -.B \-a, \-\-affinity[=PROC] -Run on processor number PROC. If PROC is not specified, run on current processor. +.B \-a, \-\-affinity[=NUM] +Run on processor number NUM. 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. diff --git a/src/svsematest/svsematest.c b/src/svsematest/svsematest.c index 607b397bf39e..7412168bd98a 100644 --- a/src/svsematest/svsematest.c +++ b/src/svsematest/svsematest.c @@ -218,33 +218,34 @@ union semun { }; -static void display_help(void) +static void display_help(int error) { printf("svsematest V %1.2f\n", VERSION); - puts("Usage: svsematest "); - puts("Function: test SYSV semaphore 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" - "-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" - " without -t default = 1\n"); - exit(1); + printf("Usage:\n" + "svsematest \n\n" + "Function: test SYSV semaphore latency\n\n" + "Avaiable 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" + "-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" + " without -t default = 1\n" + ); + exit(error); } - static int setaffinity = AFFINITY_UNSPECIFIED; static int affinity; static int priority; @@ -256,7 +257,7 @@ static int distance = 500; static int smp; static int sameprio; -static void process_options (int argc, char *argv[]) +static void process_options(int argc, char *argv[]) { int error = 0; int max_cpus = sysconf(_SC_NPROCESSORS_CONF); @@ -266,20 +267,20 @@ 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'}, - {"smp", no_argument, NULL, 'S'}, - {"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'}, + {"smp", no_argument, NULL, 'S'}, + {"threads", optional_argument, NULL, 't'}, {NULL, 0, NULL, 0} }; - int c = getopt_long (argc, argv, "a::b:d:f::i:l:D:p:St::h", + int c = getopt_long (argc, argv, "a::b:d:D:f::hi:l:p:St::", long_options, &option_index); if (c == -1) break; @@ -301,6 +302,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; @@ -312,9 +314,9 @@ static void process_options (int argc, char *argv[]) } else mustfork = 1; break; + 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 'S': smp = 1; @@ -333,8 +335,9 @@ static void process_options (int argc, char *argv[]) else num_threads = max_cpus; break; - case 'h': error = 1; break; - case '?': error = 1; break; + default: + display_help(1); + break; } } @@ -365,7 +368,7 @@ static void process_options (int argc, char *argv[]) tracelimit = thistracelimit; } if (error) - display_help (); + display_help(error); }