All of lore.kernel.org
 help / color / mirror / Atom feed
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: [PATCH rt-tests v1 07/23] rt-migrate-test: Rename command line option --output to --json
Date: Wed, 19 May 2021 19:09:29 +0200	[thread overview]
Message-ID: <20210519170945.21941-8-dwagner@suse.de> (raw)
In-Reply-To: <20210519170945.21941-1-dwagner@suse.de>

The initial idea was to have several different output format
supported but it turns out everyone is happy with JSON, so
there is no need to add another format.

Thus let's make the command line option more specific and
rename it to --json.

Signed-off-by: Daniel Wagner <dwagner@suse.de>
---
 src/rt-migrate-test/rt-migrate-test.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/rt-migrate-test/rt-migrate-test.c b/src/rt-migrate-test/rt-migrate-test.c
index 1e0abdd6c0fa..0c4dabeee249 100644
--- a/src/rt-migrate-test/rt-migrate-test.c
+++ b/src/rt-migrate-test/rt-migrate-test.c
@@ -102,7 +102,7 @@ static int done;
 static int loop;
 static int duration;
 static int quiet;
-static char outfile[MAX_PATH];
+static char jsonfile[MAX_PATH];
 
 static pthread_barrier_t start_barrier;
 static pthread_barrier_t end_barrier;
@@ -162,9 +162,9 @@ static void usage(int error)
 	       "                           days.\n"
 	       "-e       --equal           Use equal prio for #CPU-1 tasks (requires > 2 CPUS)\n"
 	       "-h       --help            Print this help message\n"
+	       "         --json=FILENAME   write final results into FILENAME, JSON formatted\n"
 	       "-l LOOPS --loops=LOOPS     Number of iterations to run (50)\n"
 	       "-m TIME  --maxerr=TIME     Max allowed error (microsecs)\n"
-	       "         --output=FILENAME write final results into FILENAME, JSON formatted\n"
 	       "-p PRIO  --prio=PRIO       base priority to start RT tasks with (2)\n"
 	       "-q       --quiet           print a summary only on exit\n"
 	       "-r TIME  --run-time=TIME   Run time (ms) to busy loop the threads (20)\n"
@@ -175,8 +175,8 @@ static void usage(int error)
 }
 
 enum option_value {
-	OPT_CHECK=1, OPT_DURATION, OPT_EQUAL, OPT_HELP, OPT_LOOPS,
-	OPT_MAXERR, OPT_OUTPUT, OPT_PRIO, OPT_QUIET, OPT_RUN_TIME,
+	OPT_CHECK=1, OPT_DURATION, OPT_EQUAL, OPT_HELP, OPT_JSON,
+	OPT_LOOPS, OPT_MAXERR, OPT_PRIO, OPT_QUIET, OPT_RUN_TIME,
 	OPT_SLEEP_TIME
 };
 
@@ -190,9 +190,9 @@ static void parse_options(int argc, char *argv[])
 			{"duration",	required_argument,	NULL, OPT_DURATION},
 			{"equal",	no_argument,		NULL, OPT_EQUAL},
 			{"help",	no_argument,		NULL, OPT_HELP},
+			{"json",	required_argument,      NULL, OPT_JSON},
 			{"loops",	required_argument,	NULL, OPT_LOOPS},
 			{"maxerr",	required_argument,	NULL, OPT_MAXERR},
-			{"output",	required_argument,      NULL, OPT_OUTPUT },
 			{"prio",	required_argument,	NULL, OPT_PRIO},
 			{"quiet",	no_argument,		NULL, OPT_QUIET},
 			{"run-time",	required_argument,	NULL, OPT_RUN_TIME},
@@ -221,6 +221,9 @@ static void parse_options(int argc, char *argv[])
 		case 'h':
 			usage(0);
 			break;
+		case OPT_JSON:
+			strncpy(jsonfile, optarg, strnlen(optarg, MAX_PATH-1));
+			break;
 		case OPT_LOOPS:
 		case 'l':
 			nr_runs = atoi(optarg);
@@ -229,9 +232,6 @@ static void parse_options(int argc, char *argv[])
 		case 'm':
 			max_err = usec2nano(atoi(optarg));
 			break;
-		case OPT_OUTPUT:
-			strncpy(outfile, optarg, strnlen(optarg, MAX_PATH-1));
-			break;
 		case OPT_PRIO:
 		case 'p':
 			prio_start = atoi(optarg);
@@ -663,8 +663,8 @@ int main (int argc, char **argv)
 
 	print_results();
 
-	if (strlen(outfile) != 0)
-		rt_write_json(outfile, check < 0, write_stats, NULL);
+	if (strlen(jsonfile) != 0)
+		rt_write_json(jsonfile, check < 0, write_stats, NULL);
 
 	if (stop) {
 		/*
-- 
2.31.1


  parent reply	other threads:[~2021-05-19 17:09 UTC|newest]

Thread overview: 47+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-05-19 17:09 [PATCH rt-tests v1 00/23] Rename --output to --json Daniel Wagner
2021-05-19 17:09 ` [PATCH rt-tests v1 01/23] cyclicdeadline: Fix JSON output format Daniel Wagner
2021-05-21 21:30   ` John Kacur
2021-05-19 17:09 ` [PATCH rt-tests v1 02/23] cyclictest: Rename command line option --output to --json Daniel Wagner
2021-05-21 21:32   ` John Kacur
2021-05-19 17:09 ` [PATCH rt-tests v1 03/23] oslat: " Daniel Wagner
2021-05-21 21:35   ` John Kacur
2021-05-19 17:09 ` [PATCH rt-tests v1 04/23] pi_stress: " Daniel Wagner
2021-05-21 21:39   ` John Kacur
2021-05-19 17:09 ` [PATCH rt-tests v1 05/23] pmqtest: " Daniel Wagner
2021-05-21 21:41   ` John Kacur
2021-05-19 17:09 ` [PATCH rt-tests v1 06/23] ptsematest: " Daniel Wagner
2021-05-21 21:45   ` John Kacur
2021-05-19 17:09 ` Daniel Wagner [this message]
2021-05-21 21:47   ` [PATCH rt-tests v1 07/23] rt-migrate-test: " John Kacur
2021-05-19 17:09 ` [PATCH rt-tests v1 08/23] cyclicdeadline: " Daniel Wagner
2021-05-21 21:49   ` John Kacur
2021-05-19 17:09 ` [PATCH rt-tests v1 09/23] signaltest: " Daniel Wagner
2021-05-21 21:51   ` John Kacur
2021-05-19 17:09 ` [PATCH rt-tests v1 10/23] sigwaittest: " Daniel Wagner
2021-05-22  3:33   ` John Kacur
2021-05-19 17:09 ` [PATCH rt-tests v1 11/23] ssdd: " Daniel Wagner
2021-05-22  3:34   ` John Kacur
2021-05-19 17:09 ` [PATCH rt-tests v1 12/23] svsematest: " Daniel Wagner
2021-05-22  3:51   ` John Kacur
2021-05-19 17:09 ` [PATCH rt-tests v1 13/23] cyclictest: Add --json to man page Daniel Wagner
2021-05-22  3:38   ` John Kacur
2021-05-19 17:09 ` [PATCH rt-tests v1 14/23] oslat: " Daniel Wagner
2021-05-22  3:39   ` John Kacur
2021-05-19 17:09 ` [PATCH rt-tests v1 15/23] pi_stress: " Daniel Wagner
2021-05-22  3:41   ` John Kacur
2021-05-19 17:09 ` [PATCH rt-tests v1 16/23] pmqtest: " Daniel Wagner
2021-05-22  3:42   ` John Kacur
2021-05-19 17:09 ` [PATCH rt-tests v1 17/23] ptsematest: " Daniel Wagner
2021-05-22  3:44   ` John Kacur
2021-05-19 17:09 ` [PATCH rt-tests v1 18/23] rt-migrate-test: " Daniel Wagner
2021-05-22  3:45   ` John Kacur
2021-05-19 17:09 ` [PATCH rt-tests v1 19/23] cyclicdeadline: " Daniel Wagner
2021-05-22  3:46   ` John Kacur
2021-05-19 17:09 ` [PATCH rt-tests v1 20/23] signaltest: " Daniel Wagner
2021-05-22  3:48   ` John Kacur
2021-05-19 17:09 ` [PATCH rt-tests v1 21/23] sigwaittest: " Daniel Wagner
2021-05-22  3:49   ` John Kacur
2021-05-19 17:09 ` [PATCH rt-tests v1 22/23] ssdd: " Daniel Wagner
2021-05-22  3:52   ` John Kacur
2021-05-19 17:09 ` [PATCH rt-tests v1 23/23] svematest: " Daniel Wagner
2021-05-22  3:54   ` 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=20210519170945.21941-8-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.