| Message ID | 20210519170945.21941-7-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/ptsematest/ptsematest.c | 18 +++++++++--------- > 1 file changed, 9 insertions(+), 9 deletions(-) > > diff --git a/src/ptsematest/ptsematest.c b/src/ptsematest/ptsematest.c > index 70eb79e89635..5822164386de 100644 > --- a/src/ptsematest/ptsematest.c > +++ b/src/ptsematest/ptsematest.c > @@ -155,8 +155,8 @@ static void display_help(int error) > " Append 'm', 'h', or 'd' to specify minutes, hours or\n" > " days.\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" > @@ -182,11 +182,11 @@ static int distance = 500; > static int smp; > static int sameprio; > 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_HELP, OPT_INTERVAL, OPT_LOOPS, OPT_OUTPUT, OPT_PRIORITY, > + OPT_HELP, OPT_INTERVAL, OPT_JSON, OPT_LOOPS, OPT_PRIORITY, > OPT_QUIET, OPT_SMP, OPT_THREADS > }; > > @@ -205,8 +205,8 @@ static void process_options(int argc, char *argv[]) > {"duration", required_argument, NULL, OPT_DURATION}, > {"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}, > @@ -250,6 +250,9 @@ 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_HELP: > case '?': > case 'h': > @@ -259,9 +262,6 @@ static void process_options(int argc, char *argv[]) > 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); > @@ -515,12 +515,12 @@ int main(int argc, char *argv[]) > pthread_mutex_destroy(&syncmutex[i]); > } > > - 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/ptsematest/ptsematest.c b/src/ptsematest/ptsematest.c index 70eb79e89635..5822164386de 100644 --- a/src/ptsematest/ptsematest.c +++ b/src/ptsematest/ptsematest.c @@ -155,8 +155,8 @@ static void display_help(int error) " Append 'm', 'h', or 'd' to specify minutes, hours or\n" " days.\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" @@ -182,11 +182,11 @@ static int distance = 500; static int smp; static int sameprio; 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_HELP, OPT_INTERVAL, OPT_LOOPS, OPT_OUTPUT, OPT_PRIORITY, + OPT_HELP, OPT_INTERVAL, OPT_JSON, OPT_LOOPS, OPT_PRIORITY, OPT_QUIET, OPT_SMP, OPT_THREADS }; @@ -205,8 +205,8 @@ static void process_options(int argc, char *argv[]) {"duration", required_argument, NULL, OPT_DURATION}, {"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}, @@ -250,6 +250,9 @@ 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_HELP: case '?': case 'h': @@ -259,9 +262,6 @@ static void process_options(int argc, char *argv[]) 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); @@ -515,12 +515,12 @@ int main(int argc, char *argv[]) pthread_mutex_destroy(&syncmutex[i]); } - 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/ptsematest/ptsematest.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)