tools/rtla: Consolidate -C/--cgroup option parsing

Each rtla tool duplicates parsing of -C/--cgroup.

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-3-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 1b9e0108b0ba67a5fd202202291dc5e0d881a2ec..3400836f66efd10a3a5782cf6ec11900b701b195 100644 (file)
--- a/tools/tracing/rtla/src/common.c
+++ b/tools/tracing/rtla/src/common.c
@@ -58,11 +58,12 @@ int common_parse_options(int argc, char **argv, struct common_params *common)
 
        static struct option long_options[] = {
                {"cpus",                required_argument,      0, 'c'},
+               {"cgroup",              optional_argument,      0, 'C'},
                {0, 0, 0, 0}
        };
 
        opterr = 0;
-       c = getopt_long(argc, argv, "c:", long_options, NULL);
+       c = getopt_long(argc, argv, "c:C::", long_options, NULL);
        opterr = 1;
 
        switch (c) {
@@ -71,6 +72,10 @@ int common_parse_options(int argc, char **argv, struct common_params *common)
                        fatal("Invalid -c cpu list");
                common->cpus = optarg;
                break;
+       case 'C':
+               common->cgroup = 1;
+               common->cgroup_name = parse_optional_arg(argc, argv);
+               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 443cb7f0e3a24d76fda9f8e3232e9d2f10dff76e..bcd4b4c963549560dfc759f87aace6afeef8de25 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'},
-                       {"cgroup",              optional_argument,      0, 'C'},
                        {"debug",               no_argument,            0, 'D'},
                        {"duration",            required_argument,      0, 'd'},
                        {"house-keeping",       required_argument,              0, 'H'},
@@ -514,7 +513,7 @@ static struct common_params
                if (common_parse_options(argc, argv, &params->common))
                        continue;
 
-               c = getopt_long(argc, argv, "a:C::b:d:e:E:DhH:p:P:r:s:S:t::T:01234:5:6:7:",
+               c = getopt_long(argc, argv, "a:b:d:e:E:DhH:p:P:r:s:S:t::T:01234:5:6:7:",
                                 long_options, NULL);
 
                /* detect the end of the options. */
@@ -540,10 +539,6 @@ static struct common_params
                            params->common.hist.bucket_size >= 1000000)
                                fatal("Bucket size needs to be > 0 and <= 1000000");
                        break;
-               case 'C':
-                       params->common.cgroup = 1;
-                       params->common.cgroup_name = parse_optional_arg(argc, argv);
-                       break;
                case 'D':
                        config_debug = 1;
                        break;

diff --git a/tools/tracing/rtla/src/osnoise_top.c b/tools/tracing/rtla/src/osnoise_top.c
index 8ba0757225b3c4e6420d999aa183e45e9b0cb0ff..2799dd75a4e2ac3b80a2745b0b06872e6865978e 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'},
-                       {"cgroup",              optional_argument,      0, 'C'},
                        {"debug",               no_argument,            0, 'D'},
                        {"duration",            required_argument,      0, 'd'},
                        {"event",               required_argument,      0, 'e'},
@@ -365,7 +364,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:C::d:De:hH:p:P:qr:s:S:t::T:0:1:2:3:",
+               c = getopt_long(argc, argv, "a:d:De:hH:p:P:qr:s:S:t::T:0:1:2:3:",
                                 long_options, NULL);
 
                /* Detect the end of the options. */
@@ -384,10 +383,6 @@ struct common_params *osnoise_top_parse_args(int argc, char **argv)
                        if (!trace_output)
                                trace_output = "osnoise_trace.txt";
 
-                       break;
-               case 'C':
-                       params->common.cgroup = 1;
-                       params->common.cgroup_name = parse_optional_arg(argc, argv);
                        break;
                case 'D':
                        config_debug = 1;

diff --git a/tools/tracing/rtla/src/timerlat_hist.c b/tools/tracing/rtla/src/timerlat_hist.c
index 3571aa8233c18be3d53230a0751d563a0e6e47c2..64c1dbb1fccc608e5724aa41fce4dac5b048bedd 100644 (file)
--- a/tools/tracing/rtla/src/timerlat_hist.c
+++ b/tools/tracing/rtla/src/timerlat_hist.c
@@ -791,7 +791,6 @@ static struct common_params
        while (1) {
                static struct option long_options[] = {
                        {"auto",                required_argument,      0, 'a'},
-                       {"cgroup",              optional_argument,      0, 'C'},
                        {"bucket-size",         required_argument,      0, 'b'},
                        {"debug",               no_argument,            0, 'D'},
                        {"entries",             required_argument,      0, 'E'},
@@ -832,7 +831,7 @@ static struct common_params
                if (common_parse_options(argc, argv, &params->common))
                        continue;
 
-               c = getopt_long(argc, argv, "a:C::b:d:e:E:DhH:i:knp:P:s:t::T:uU0123456:7:8:9\1\2:\3:",
+               c = getopt_long(argc, argv, "a:b:d:e:E:DhH:i:knp:P:s:t::T:uU0123456:7:8:9\1\2:\3:",
                                 long_options, NULL);
 
                /* detect the end of the options. */
@@ -854,10 +853,6 @@ static struct common_params
                        if (!trace_output)
                                trace_output = "timerlat_trace.txt";
 
-                       break;
-               case 'C':
-                       params->common.cgroup = 1;
-                       params->common.cgroup_name = parse_optional_arg(argc, argv);
                        break;
                case 'b':
                        params->common.hist.bucket_size = get_llong_from_str(optarg);

diff --git a/tools/tracing/rtla/src/timerlat_top.c b/tools/tracing/rtla/src/timerlat_top.c
index b0a048cded29c091286fa0b12aba4515237b79d3..bdc8bf265836b047a68b07babd172f48b3c8b932 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'},
-                       {"cgroup",              optional_argument,      0, 'C'},
                        {"debug",               no_argument,            0, 'D'},
                        {"duration",            required_argument,      0, 'd'},
                        {"event",               required_argument,      0, 'e'},
@@ -596,7 +595,7 @@ static struct common_params
                if (common_parse_options(argc, argv, &params->common))
                        continue;
 
-               c = getopt_long(argc, argv, "a:C::d:De:hH:i:knp:P:qs:t::T:uU0:1:2:345:6:7:",
+               c = getopt_long(argc, argv, "a:d:De:hH:i:knp:P:qs:t::T:uU0:1:2:345:6:7:",
                                 long_options, NULL);
 
                /* detect the end of the options. */
@@ -633,10 +632,6 @@ static struct common_params
                        /* set aa_only to avoid parsing the trace */
                        params->common.aa_only = 1;
                        break;
-               case 'C':
-                       params->common.cgroup = 1;
-                       params->common.cgroup_name = optarg;
-                       break;
                case 'D':
                        config_debug = 1;
                        break;