On Tue, Dec 09, 2025 at 12:00:44PM +0200, Costa Shulyupin wrote: > Each rtla tool duplicates parsing of -d/--duration. > > Migrate the option parsing from individual tools to the > common_parse_options(). > > Signed-off-by: Costa Shulyupin <[email protected]> > --- > tools/tracing/rtla/src/common.c | 8 +++++++- > tools/tracing/rtla/src/osnoise_hist.c | 8 +------- > tools/tracing/rtla/src/osnoise_top.c | 8 +------- > tools/tracing/rtla/src/timerlat_hist.c | 8 +------- > tools/tracing/rtla/src/timerlat_top.c | 8 +------- > 5 files changed, 11 insertions(+), 29 deletions(-) > > diff --git a/tools/tracing/rtla/src/common.c b/tools/tracing/rtla/src/common.c > index 5bf79a9bb152..e6ff011d2cd2 100644 > --- a/tools/tracing/rtla/src/common.c > +++ b/tools/tracing/rtla/src/common.c > @@ -59,11 +59,12 @@ int common_parse_options(int argc, char **argv, struct > common_params *common) > {"cpus", required_argument, 0, 'c'}, > {"cgroup", optional_argument, 0, 'C'}, > {"debug", no_argument, 0, 'D'}, > + {"duration", required_argument, 0, 'd'}, > {0, 0, 0, 0} > }; > > opterr = 0; > - c = getopt_long(argc, argv, "c:C::D", long_options, NULL); > + c = getopt_long(argc, argv, "c:C::Dd:", long_options, NULL); > opterr = 1; > > switch (c) { > @@ -79,6 +80,11 @@ int common_parse_options(int argc, char **argv, struct > common_params *common) > case 'D': > config_debug = 1; > break; > + case 'd': > + common->duration = parse_seconds_duration(optarg); > + if (!common->duration) > + fatal("Invalid -d duration"); > + break; > default: > optind = saved_state; > return 0; > diff --git a/tools/tracing/rtla/src/osnoise_hist.c > b/tools/tracing/rtla/src/osnoise_hist.c > index 6902486fb144..1b79bfefc214 100644 > --- a/tools/tracing/rtla/src/osnoise_hist.c > +++ b/tools/tracing/rtla/src/osnoise_hist.c > @@ -491,7 +491,6 @@ static struct common_params > {"auto", required_argument, 0, 'a'}, > {"bucket-size", required_argument, 0, 'b'}, > {"entries", required_argument, 0, 'E'}, > - {"duration", required_argument, 0, 'd'}, > {"house-keeping", required_argument, > 0, 'H'}, > {"help", no_argument, 0, 'h'}, > {"period", required_argument, 0, 'p'}, > @@ -518,7 +517,7 @@ static struct common_params > if (common_parse_options(argc, argv, ¶ms->common)) > continue; > > - c = getopt_long(argc, argv, > "a:b:d:e:E:hH:p:P:r:s:S:t::T:01234:5:6:7:", > + c = getopt_long(argc, argv, > "a:b:e:E:hH:p:P:r:s:S:t::T:01234:5:6:7:", > long_options, NULL); > > /* detect the end of the options. */ > @@ -544,11 +543,6 @@ static struct common_params > params->common.hist.bucket_size >= 1000000) > fatal("Bucket size needs to be > 0 and <= > 1000000"); > break; > - case 'd': > - params->common.duration = > parse_seconds_duration(optarg); > - if (!params->common.duration) > - fatal("Invalid -D duration"); > - break; > case 'e': > tevent = trace_event_alloc(optarg); > if (!tevent) > diff --git a/tools/tracing/rtla/src/osnoise_top.c > b/tools/tracing/rtla/src/osnoise_top.c > index 4a61fd50b990..619c5bcf8f35 100644 > --- a/tools/tracing/rtla/src/osnoise_top.c > +++ b/tools/tracing/rtla/src/osnoise_top.c > @@ -346,7 +346,6 @@ struct common_params *osnoise_top_parse_args(int argc, > char **argv) > while (1) { > static struct option long_options[] = { > {"auto", required_argument, 0, 'a'}, > - {"duration", required_argument, 0, 'd'}, > {"event", required_argument, 0, 'e'}, > {"house-keeping", required_argument, 0, 'H'}, > {"help", no_argument, 0, 'h'}, > @@ -370,7 +369,7 @@ struct common_params *osnoise_top_parse_args(int argc, > char **argv) > if (common_parse_options(argc, argv, ¶ms->common)) > continue; > > - c = getopt_long(argc, argv, "a:d:e:hH:p:P:qr:s:S:t::T:0:1:2:3:", > + c = getopt_long(argc, argv, "a:e:hH:p:P:qr:s:S:t::T:0:1:2:3:", > long_options, NULL); > > /* Detect the end of the options. */ > @@ -390,11 +389,6 @@ struct common_params *osnoise_top_parse_args(int argc, > char **argv) > trace_output = "osnoise_trace.txt"; > > break; > - case 'd': > - params->common.duration = > parse_seconds_duration(optarg); > - if (!params->common.duration) > - fatal("Invalid -d duration"); > - break; > case 'e': > tevent = trace_event_alloc(optarg); > if (!tevent) > diff --git a/tools/tracing/rtla/src/timerlat_hist.c > b/tools/tracing/rtla/src/timerlat_hist.c > index 97d20e272583..0a7e5dcce121 100644 > --- a/tools/tracing/rtla/src/timerlat_hist.c > +++ b/tools/tracing/rtla/src/timerlat_hist.c > @@ -798,7 +798,6 @@ static struct common_params > {"auto", required_argument, 0, 'a'}, > {"bucket-size", required_argument, 0, 'b'}, > {"entries", required_argument, 0, 'E'}, > - {"duration", required_argument, 0, 'd'}, > {"house-keeping", required_argument, 0, 'H'}, > {"help", no_argument, 0, 'h'}, > {"irq", required_argument, 0, 'i'}, > @@ -834,7 +833,7 @@ static struct common_params > if (common_parse_options(argc, argv, ¶ms->common)) > continue; > > - c = getopt_long(argc, argv, > "a:b:d:e:E:hH:i:knp:P:s:t::T:uU0123456:7:8:9\1\2:\3:", > + c = getopt_long(argc, argv, > "a:b:e:E:hH:i:knp:P:s:t::T:uU0123456:7:8:9\1\2:\3:", > long_options, NULL); > > /* detect the end of the options. */ > @@ -863,11 +862,6 @@ static struct common_params > params->common.hist.bucket_size >= 1000000) > fatal("Bucket size needs to be > 0 and <= > 1000000"); > break; > - case 'd': > - params->common.duration = > parse_seconds_duration(optarg); > - if (!params->common.duration) > - fatal("Invalid -D duration"); > - break; > case 'e': > tevent = trace_event_alloc(optarg); > if (!tevent) > diff --git a/tools/tracing/rtla/src/timerlat_top.c > b/tools/tracing/rtla/src/timerlat_top.c > index 96bca67d419f..4340fbf3f879 100644 > --- a/tools/tracing/rtla/src/timerlat_top.c > +++ b/tools/tracing/rtla/src/timerlat_top.c > @@ -566,7 +566,6 @@ static struct common_params > while (1) { > static struct option long_options[] = { > {"auto", required_argument, 0, 'a'}, > - {"duration", required_argument, 0, 'd'}, > {"event", required_argument, 0, 'e'}, > {"help", no_argument, 0, 'h'}, > {"house-keeping", required_argument, 0, 'H'}, > @@ -598,7 +597,7 @@ static struct common_params > if (common_parse_options(argc, argv, ¶ms->common)) > continue; > > - c = getopt_long(argc, argv, > "a:d:e:hH:i:knp:P:qs:t::T:uU0:1:2:345:6:7:", > + c = getopt_long(argc, argv, > "a:e:hH:i:knp:P:qs:t::T:uU0:1:2:345:6:7:", > long_options, NULL); > > /* detect the end of the options. */ > @@ -635,11 +634,6 @@ static struct common_params > /* set aa_only to avoid parsing the trace */ > params->common.aa_only = 1; > break; > - case 'd': > - params->common.duration = > parse_seconds_duration(optarg); > - if (!params->common.duration) > - fatal("Invalid -d duration"); > - break; > case 'e': > tevent = trace_event_alloc(optarg); > if (!tevent) > -- > 2.52.0 >
Reviewed-by: Wander Lairson Costa <[email protected]>
