tools/rtla: Consolidate -d/--duration option parsing

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 <costa.shul@redhat.com>
Link: https://lore.kernel.org/r/20251209100047.2692515-5-costa.shul@redhat.com
Signed-off-by: Tomas Glozar <tglozar@redhat.com>

diff --git a/tools/tracing/rtla/src/common.c b/tools/tracing/rtla/src/common.c
index f71cf7c7f4e3dc32991b86993935944e48df1c63..0776f1568d23e63ee5a9bcc2da7203580349e802 100644 (file)
--- a/tools/tracing/rtla/src/common.c
+++ b/tools/tracing/rtla/src/common.c
@@ -60,11 +60,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) {
@@ -80,6 +81,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 c9422b596622ffab161c86eff1a01692644e82e8..f34c88fd57e2d8e05dc5323422bc8e6f2a29cacc 100644 (file)
--- a/tools/tracing/rtla/src/osnoise_hist.c
+++ b/tools/tracing/rtla/src/osnoise_hist.c
@@ -485,7 +485,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'},
@@ -512,7 +511,7 @@ static struct common_params
                if (common_parse_options(argc, argv, &params->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. */
@@ -538,11 +537,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 8d49042d10f0d01fcdc6f11f2fcfde528ddc6545..695c6ecf00982913007902ca176d5c4b579c1a13 100644 (file)
--- a/tools/tracing/rtla/src/osnoise_top.c
+++ b/tools/tracing/rtla/src/osnoise_top.c
@@ -339,7 +339,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'},
@@ -363,7 +362,7 @@ struct common_params *osnoise_top_parse_args(int argc, char **argv)
                if (common_parse_options(argc, argv, &params->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. */
@@ -383,11 +382,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 c08f628047c1d26581a34fc8bb9c3d470b853d20..d625dbe446762a651c59dac31ae99a51f5191062 100644 (file)
--- a/tools/tracing/rtla/src/timerlat_hist.c
+++ b/tools/tracing/rtla/src/timerlat_hist.c
@@ -793,7 +793,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'},
@@ -830,7 +829,7 @@ static struct common_params
                if (common_parse_options(argc, argv, &params->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. */
@@ -859,11 +858,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 7c0a3f5822736e96b09e03d06f9703f313e1ac9f..95e949f49cbd55ff23fad2a11f685c5958c5fbfa 100644 (file)
--- a/tools/tracing/rtla/src/timerlat_top.c
+++ b/tools/tracing/rtla/src/timerlat_top.c
@@ -561,7 +561,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'},
@@ -594,7 +593,7 @@ static struct common_params
                if (common_parse_options(argc, argv, &params->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. */
@@ -631,11 +630,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)