github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-12 16:18:45 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

tools/rtla: Consolidate -c/--cpus option parsing

Browse Source 
Each rtla tool duplicates parsing of -c/--cpus.

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-2-costa.shul@redhat.com
Signed-off-by: Tomas Glozar <tglozar@redhat.com>
This commit is contained in:
Costa Shulyupin 2025-12-09 12:00:41 +02:00 committed by Tomas Glozar
parent 850cd24cb6
commit 28dc445919
5 changed files with 11 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/tracing/rtla/src/common.c
View File

@ -57,14 +57,20 @@ int common_parse_options(int argc, char **argv, struct common_params *common)
int c;
static struct option long_options[] = {
{"cpus", required_argument, 0, 'c'},
{0, 0, 0, 0}
};
opterr = 0;
c = getopt_long(argc, argv, "", long_options, NULL);
c = getopt_long(argc, argv, "c:", long_options, NULL);
opterr = 1;
switch (c) {
case 'c':
if (parse_cpu_set(optarg, &common->monitored_cpus))
fatal("Invalid -c cpu list");
common->cpus = optarg;
break;
default:
optind = saved_state;
return 0;

9
tools/tracing/rtla/src/osnoise_hist.c
View File

@ -485,7 +485,6 @@ static struct common_params
{"auto", required_argument, 0, 'a'},
{"bucket-size", required_argument, 0, 'b'},
{"entries", required_argument, 0, 'E'},
{"cpus", required_argument, 0, 'c'},
{"cgroup", optional_argument, 0, 'C'},
{"debug", no_argument, 0, 'D'},
{"duration", required_argument, 0, 'd'},
@ -515,7 +514,7 @@ static struct common_params
if (common_parse_options(argc, argv, &params->common))
continue;
c = getopt_long(argc, argv, "a:c:C::b:d:e:E:DhH:p:P:r:s:S:t::T:01234:5:6:7:",
c = getopt_long(argc, argv, "a:C::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. */
@ -541,12 +540,6 @@ static struct common_params
params->common.hist.bucket_size >= 1000000)
fatal("Bucket size needs to be > 0 and <= 1000000");
break;
case 'c':
retval = parse_cpu_set(optarg, &params->common.monitored_cpus);
if (retval)
fatal("Invalid -c cpu list");
params->common.cpus = optarg;
break;
case 'C':
params->common.cgroup = 1;
params->common.cgroup_name = parse_optional_arg(argc, argv);

9
tools/tracing/rtla/src/osnoise_top.c
View File

@ -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'},
{"cpus", required_argument, 0, 'c'},
{"cgroup", optional_argument, 0, 'C'},
{"debug", no_argument, 0, 'D'},
{"duration", required_argument, 0, 'd'},
@ -366,7 +365,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:C::d:De:hH:p:P:qr:s:S:t::T:0:1:2:3:",
c = getopt_long(argc, argv, "a:C::d:De:hH:p:P:qr:s:S:t::T:0:1:2:3:",
long_options, NULL);
/* Detect the end of the options. */
@ -385,12 +384,6 @@ struct common_params *osnoise_top_parse_args(int argc, char **argv)
if (!trace_output)
trace_output = "osnoise_trace.txt";
break;
case 'c':
retval = parse_cpu_set(optarg, &params->common.monitored_cpus);
if (retval)
fatal("Invalid -c cpu list");
params->common.cpus = optarg;
break;
case 'C':
params->common.cgroup = 1;

9
tools/tracing/rtla/src/timerlat_hist.c
View File

@ -791,7 +791,6 @@ static struct common_params
while (1) {
static struct option long_options[] = {
{"auto", required_argument, 0, 'a'},
{"cpus", required_argument, 0, 'c'},
{"cgroup", optional_argument, 0, 'C'},
{"bucket-size", required_argument, 0, 'b'},
{"debug", no_argument, 0, 'D'},
@ -833,7 +832,7 @@ static struct common_params
if (common_parse_options(argc, argv, &params->common))
continue;
c = getopt_long(argc, argv, "a:c: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:C::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. */
@ -855,12 +854,6 @@ static struct common_params
if (!trace_output)
trace_output = "timerlat_trace.txt";
break;
case 'c':
retval = parse_cpu_set(optarg, &params->common.monitored_cpus);
if (retval)
fatal("Invalid -c cpu list");
params->common.cpus = optarg;
break;
case 'C':
params->common.cgroup = 1;

9
tools/tracing/rtla/src/timerlat_top.c
View File

@ -561,7 +561,6 @@ static struct common_params
while (1) {
static struct option long_options[] = {
{"auto", required_argument, 0, 'a'},
{"cpus", required_argument, 0, 'c'},
{"cgroup", optional_argument, 0, 'C'},
{"debug", no_argument, 0, 'D'},
{"duration", required_argument, 0, 'd'},
@ -597,7 +596,7 @@ static struct common_params
if (common_parse_options(argc, argv, &params->common))
continue;
c = getopt_long(argc, argv, "a:c:C::d:De:hH:i:knp:P:qs:t::T:uU0:1:2:345:6:7:",
c = getopt_long(argc, argv, "a:C::d:De:hH:i:knp:P:qs:t::T:uU0:1:2:345:6:7:",
long_options, NULL);
/* detect the end of the options. */
@ -634,12 +633,6 @@ static struct common_params
/* set aa_only to avoid parsing the trace */
params->common.aa_only = 1;
break;
case 'c':
retval = parse_cpu_set(optarg, &params->common.monitored_cpus);
if (retval)
fatal("Invalid -c cpu list");
params->common.cpus = optarg;
break;
case 'C':
params->common.cgroup = 1;
params->common.cgroup_name = optarg;