Commit edb23c83 authored by Costa Shulyupin's avatar Costa Shulyupin Committed by Tomas Glozar
Browse files

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: default avatarCosta Shulyupin <costa.shul@redhat.com>
Link: https://lore.kernel.org/r/20251209100047.2692515-3-costa.shul@redhat.com


Signed-off-by: default avatarTomas Glozar <tglozar@redhat.com>
parent 28dc4459

tools/tracing/rtla/src/common.c

+6 −1
Original line number Diff line number Diff line
@@ -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;

tools/tracing/rtla/src/osnoise_hist.c

+1 −6
Original line number Diff line number Diff line
@@ -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;

tools/tracing/rtla/src/osnoise_top.c

+1 −6
Original line number Diff line number Diff line
@@ -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;

tools/tracing/rtla/src/timerlat_hist.c

+1 −6
Original line number Diff line number Diff line
@@ -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);

tools/tracing/rtla/src/timerlat_top.c

+1 −6
Original line number Diff line number Diff line
@@ -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;