| Message ID | 20210519170945.21941-11-dwagner@suse.de |
|---|---|
| State | New |
| Headers | show |
| Series | Rename --output to --json | expand |
On Wed, 19 May 2021, Daniel Wagner wrote: > 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/sigwaittest/sigwaittest.c | 18 +++++++++--------- > 1 file changed, 9 insertions(+), 9 deletions(-) > > diff --git a/src/sigwaittest/sigwaittest.c b/src/sigwaittest/sigwaittest.c > index fda44724dd62..98a740d2cce2 100644 > --- a/src/sigwaittest/sigwaittest.c > +++ b/src/sigwaittest/sigwaittest.c > @@ -220,8 +220,8 @@ static void display_help(int error) > " 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" > + " --json=FILENAME write final results into FILENAME, JSON formatted\n" > "-l LOOPS --loops=LOOPS number of loops: default=0(endless)\n" > - " --output=FILENAME write final results into FILENAME, JSON formatted\n" > "-p PRIO --prio=PRIO priority\n" > "-q --quiet print a summary only on exit\n" > "-t --threads one thread per available processor\n" > @@ -242,11 +242,11 @@ static int duration; > static int interval = 1000; > static int distance = 500; > static int quiet; > -static char outfile[MAX_PATH]; > +static char jsonfile[MAX_PATH]; > > enum option_value { > OPT_AFFINITY=1, OPT_BREAKTRACE, OPT_DISTANCE, OPT_DURATION, > - OPT_FORK, OPT_HELP, OPT_INTERVAL, OPT_LOOPS, OPT_OUTPUT, > + OPT_FORK, OPT_HELP, OPT_INTERVAL, OPT_JSON, OPT_LOOPS, > OPT_PRIORITY, OPT_QUIET, OPT_THREADS > }; > > @@ -267,8 +267,8 @@ static void process_options(int argc, char *argv[]) > {"fork", optional_argument, NULL, OPT_FORK}, > {"help", no_argument, NULL, OPT_HELP}, > {"interval", required_argument, NULL, OPT_INTERVAL}, > + {"json", required_argument, NULL, OPT_JSON}, > {"loops", required_argument, NULL, OPT_LOOPS}, > - {"output", required_argument, NULL, OPT_OUTPUT }, > {"priority", required_argument, NULL, OPT_PRIORITY}, > {"quiet", no_argument, NULL, OPT_QUIET}, > {"threads", optional_argument, NULL, OPT_THREADS}, > @@ -324,13 +324,13 @@ static void process_options(int argc, char *argv[]) > case 'i': > interval = atoi(optarg); > break; > + case OPT_JSON: > + strncpy(jsonfile, optarg, strnlen(optarg, MAX_PATH-1)); > + break; > case OPT_LOOPS: > case 'l': > max_cycles = atoi(optarg); > break; > - case OPT_OUTPUT: > - strncpy(outfile, optarg, strnlen(optarg, MAX_PATH-1)); > - break; > case OPT_PRIORITY: > case 'p': > priority = atoi(optarg); > @@ -702,12 +702,12 @@ int main(int argc, char *argv[]) > } > } > > - if (strlen(outfile) != 0) { > + if (strlen(jsonfile) != 0) { > struct params_stats ps = { > .receiver = receiver, > .sender = sender, > }; > - rt_write_json(outfile, 0, write_stats, &ps); > + rt_write_json(jsonfile, 0, write_stats, &ps); > } > > nomem: > -- > 2.31.1 > > Signed-off-by: John Kacur <jkacur@redhat.com>
diff --git a/src/sigwaittest/sigwaittest.c b/src/sigwaittest/sigwaittest.c index fda44724dd62..98a740d2cce2 100644 --- a/src/sigwaittest/sigwaittest.c +++ b/src/sigwaittest/sigwaittest.c @@ -220,8 +220,8 @@ static void display_help(int error) " 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" + " --json=FILENAME write final results into FILENAME, JSON formatted\n" "-l LOOPS --loops=LOOPS number of loops: default=0(endless)\n" - " --output=FILENAME write final results into FILENAME, JSON formatted\n" "-p PRIO --prio=PRIO priority\n" "-q --quiet print a summary only on exit\n" "-t --threads one thread per available processor\n" @@ -242,11 +242,11 @@ static int duration; static int interval = 1000; static int distance = 500; static int quiet; -static char outfile[MAX_PATH]; +static char jsonfile[MAX_PATH]; enum option_value { OPT_AFFINITY=1, OPT_BREAKTRACE, OPT_DISTANCE, OPT_DURATION, - OPT_FORK, OPT_HELP, OPT_INTERVAL, OPT_LOOPS, OPT_OUTPUT, + OPT_FORK, OPT_HELP, OPT_INTERVAL, OPT_JSON, OPT_LOOPS, OPT_PRIORITY, OPT_QUIET, OPT_THREADS }; @@ -267,8 +267,8 @@ static void process_options(int argc, char *argv[]) {"fork", optional_argument, NULL, OPT_FORK}, {"help", no_argument, NULL, OPT_HELP}, {"interval", required_argument, NULL, OPT_INTERVAL}, + {"json", required_argument, NULL, OPT_JSON}, {"loops", required_argument, NULL, OPT_LOOPS}, - {"output", required_argument, NULL, OPT_OUTPUT }, {"priority", required_argument, NULL, OPT_PRIORITY}, {"quiet", no_argument, NULL, OPT_QUIET}, {"threads", optional_argument, NULL, OPT_THREADS}, @@ -324,13 +324,13 @@ static void process_options(int argc, char *argv[]) case 'i': interval = atoi(optarg); break; + case OPT_JSON: + strncpy(jsonfile, optarg, strnlen(optarg, MAX_PATH-1)); + break; case OPT_LOOPS: case 'l': max_cycles = atoi(optarg); break; - case OPT_OUTPUT: - strncpy(outfile, optarg, strnlen(optarg, MAX_PATH-1)); - break; case OPT_PRIORITY: case 'p': priority = atoi(optarg); @@ -702,12 +702,12 @@ int main(int argc, char *argv[]) } } - if (strlen(outfile) != 0) { + if (strlen(jsonfile) != 0) { struct params_stats ps = { .receiver = receiver, .sender = sender, }; - rt_write_json(outfile, 0, write_stats, &ps); + rt_write_json(jsonfile, 0, write_stats, &ps); } nomem:
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/sigwaittest/sigwaittest.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)