| Message ID | 20210519170945.21941-6-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/pmqtest/pmqtest.c | 21 ++++++++++----------- > 1 file changed, 10 insertions(+), 11 deletions(-) > > diff --git a/src/pmqtest/pmqtest.c b/src/pmqtest/pmqtest.c > index af10b416600c..edda7c69652e 100644 > --- a/src/pmqtest/pmqtest.c > +++ b/src/pmqtest/pmqtest.c > @@ -231,8 +231,8 @@ static void display_help(int error) > "-f TO --forcetimeout=TO force timeout of mq_timedreceive(), requires -T\n" > "-h --help print this help message\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" > "-S --smp SMP testing: options -a -t and same priority\n" > @@ -260,13 +260,12 @@ static int sameprio; > static int timeout; > static int forcetimeout; > 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_FORCETIMEOUT, OPT_HELP, OPT_INTERVAL, OPT_LOOPS, > - OPT_OUTPUT, OPT_PRIORITY, OPT_QUIET, OPT_SMP, OPT_THREADS, > - OPT_TIMEOUT > + OPT_FORCETIMEOUT, OPT_HELP, OPT_INTERVAL, OPT_JSON, OPT_LOOPS, > + OPT_PRIORITY, OPT_QUIET, OPT_SMP, OPT_THREADS, OPT_TIMEOUT > }; > > static void process_options(int argc, char *argv[]) > @@ -285,8 +284,8 @@ static void process_options(int argc, char *argv[]) > {"forcetimeout",required_argument, NULL, OPT_FORCETIMEOUT}, > {"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}, > {"smp", no_argument, NULL, OPT_SMP}, > @@ -340,13 +339,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); > @@ -647,12 +646,12 @@ int main(int argc, char *argv[]) > mq_unlink(mqname); > } > > - 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/pmqtest/pmqtest.c b/src/pmqtest/pmqtest.c index af10b416600c..edda7c69652e 100644 --- a/src/pmqtest/pmqtest.c +++ b/src/pmqtest/pmqtest.c @@ -231,8 +231,8 @@ static void display_help(int error) "-f TO --forcetimeout=TO force timeout of mq_timedreceive(), requires -T\n" "-h --help print this help message\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" "-S --smp SMP testing: options -a -t and same priority\n" @@ -260,13 +260,12 @@ static int sameprio; static int timeout; static int forcetimeout; 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_FORCETIMEOUT, OPT_HELP, OPT_INTERVAL, OPT_LOOPS, - OPT_OUTPUT, OPT_PRIORITY, OPT_QUIET, OPT_SMP, OPT_THREADS, - OPT_TIMEOUT + OPT_FORCETIMEOUT, OPT_HELP, OPT_INTERVAL, OPT_JSON, OPT_LOOPS, + OPT_PRIORITY, OPT_QUIET, OPT_SMP, OPT_THREADS, OPT_TIMEOUT }; static void process_options(int argc, char *argv[]) @@ -285,8 +284,8 @@ static void process_options(int argc, char *argv[]) {"forcetimeout",required_argument, NULL, OPT_FORCETIMEOUT}, {"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}, {"smp", no_argument, NULL, OPT_SMP}, @@ -340,13 +339,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); @@ -647,12 +646,12 @@ int main(int argc, char *argv[]) mq_unlink(mqname); } - 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/pmqtest/pmqtest.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-)