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

tools/rtla: Consolidate -P/--priority option parsing 



Each rtla tool duplicates parsing of -P/--priority.

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-7-costa.shul@redhat.com


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

tools/tracing/rtla/src/common.c

+7 −1
Original line number Diff line number Diff line
@@ -63,11 +63,12 @@ int common_parse_options(int argc, char **argv, struct common_params *common) 
		{"debug",               no_argument,            0, 'D'},

		{"duration",            required_argument,      0, 'd'},

		{"event",               required_argument,      0, 'e'},

		{"priority",            required_argument,      0, 'P'},

		{0, 0, 0, 0}

	};



	opterr = 0;

	c = getopt_long(argc, argv, "c:C::Dd:e:", long_options, NULL);

	c = getopt_long(argc, argv, "c:C::Dd:e:P:", long_options, NULL);

	opterr = 1;



	switch (c) {
@@ -97,6 +98,11 @@ int common_parse_options(int argc, char **argv, struct common_params *common) 
			tevent->next = common->events;

		common->events = tevent;

		break;

	case 'P':

		if (parse_prio(optarg, &common->sched_param) == -1)

			fatal("Invalid -P priority");

		common->set_sched = 1;

		break;

	default:

		optind = saved_state;

		return 0;

tools/tracing/rtla/src/osnoise_hist.c

+1 −8
Original line number Diff line number Diff line
@@ -487,7 +487,6 @@ static struct common_params 
			{"house-keeping",	required_argument,		0, 'H'},

			{"help",		no_argument,		0, 'h'},

			{"period",		required_argument,	0, 'p'},

			{"priority",		required_argument,	0, 'P'},

			{"runtime",		required_argument,	0, 'r'},

			{"stop",		required_argument,	0, 's'},

			{"stop-total",		required_argument,	0, 'S'},
@@ -509,7 +508,7 @@ static struct common_params 
		if (common_parse_options(argc, argv, &params->common))

			continue;



		c = getopt_long(argc, argv, "a:b:E:hH:p:P:r:s:S:t::T:01234:5:6:7:",

		c = getopt_long(argc, argv, "a:b:E:hH:p:r:s:S:t::T:01234:5:6:7:",

				 long_options, NULL);



		/* detect the end of the options. */
@@ -556,12 +555,6 @@ static struct common_params 
			if (params->period > 10000000)

				fatal("Period longer than 10 s");

			break;

		case 'P':

			retval = parse_prio(optarg, &params->common.sched_param);

			if (retval == -1)

				fatal("Invalid -P priority");

			params->common.set_sched = 1;

			break;

		case 'r':

			params->runtime = get_llong_from_str(optarg);

			if (params->runtime < 100)

tools/tracing/rtla/src/osnoise_top.c

+1 −8
Original line number Diff line number Diff line
@@ -341,7 +341,6 @@ struct common_params *osnoise_top_parse_args(int argc, char **argv) 
			{"house-keeping",	required_argument,	0, 'H'},

			{"help",		no_argument,		0, 'h'},

			{"period",		required_argument,	0, 'p'},

			{"priority",		required_argument,	0, 'P'},

			{"quiet",		no_argument,		0, 'q'},

			{"runtime",		required_argument,	0, 'r'},

			{"stop",		required_argument,	0, 's'},
@@ -360,7 +359,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:hH:p:P:qr:s:S:t::T:0:1:2:3:",

		c = getopt_long(argc, argv, "a:hH:p:qr:s:S:t::T:0:1:2:3:",

				 long_options, NULL);



		/* Detect the end of the options. */
@@ -395,12 +394,6 @@ struct common_params *osnoise_top_parse_args(int argc, char **argv) 
			if (params->period > 10000000)

				fatal("Period longer than 10 s");

			break;

		case 'P':

			retval = parse_prio(optarg, &params->common.sched_param);

			if (retval == -1)

				fatal("Invalid -P priority");

			params->common.set_sched = 1;

			break;

		case 'q':

			params->common.quiet = 1;

			break;

tools/tracing/rtla/src/timerlat_hist.c

+1 −8
Original line number Diff line number Diff line
@@ -797,7 +797,6 @@ static struct common_params 
			{"irq",			required_argument,	0, 'i'},

			{"nano",		no_argument,		0, 'n'},

			{"period",		required_argument,	0, 'p'},

			{"priority",		required_argument,	0, 'P'},

			{"stack",		required_argument,	0, 's'},

			{"thread",		required_argument,	0, 'T'},

			{"trace",		optional_argument,	0, 't'},
@@ -827,7 +826,7 @@ static struct common_params 
		if (common_parse_options(argc, argv, &params->common))

			continue;



		c = getopt_long(argc, argv, "a:b:E:hH:i:knp:P:s:t::T:uU0123456:7:8:9\1\2:\3:",

		c = getopt_long(argc, argv, "a:b:E:hH:i:knp:s:t::T:uU0123456:7:8:9\1\2:\3:",

				 long_options, NULL);



		/* detect the end of the options. */
@@ -886,12 +885,6 @@ static struct common_params 
			if (params->timerlat_period_us > 1000000)

				fatal("Period longer than 1 s");

			break;

		case 'P':

			retval = parse_prio(optarg, &params->common.sched_param);

			if (retval == -1)

				fatal("Invalid -P priority");

			params->common.set_sched = 1;

			break;

		case 's':

			params->print_stack = get_llong_from_str(optarg);

			break;

tools/tracing/rtla/src/timerlat_top.c

+1 −8
Original line number Diff line number Diff line
@@ -565,7 +565,6 @@ static struct common_params 
			{"irq",			required_argument,	0, 'i'},

			{"nano",		no_argument,		0, 'n'},

			{"period",		required_argument,	0, 'p'},

			{"priority",		required_argument,	0, 'P'},

			{"quiet",		no_argument,		0, 'q'},

			{"stack",		required_argument,	0, 's'},

			{"thread",		required_argument,	0, 'T'},
@@ -591,7 +590,7 @@ static struct common_params 
		if (common_parse_options(argc, argv, &params->common))

			continue;



		c = getopt_long(argc, argv, "a:hH:i:knp:P:qs:t::T:uU0:1:2:345:6:7:",

		c = getopt_long(argc, argv, "a:hH:i:knp:qs:t::T:uU0:1:2:345:6:7:",

				 long_options, NULL);



		/* detect the end of the options. */
@@ -652,12 +651,6 @@ static struct common_params 
			if (params->timerlat_period_us > 1000000)

				fatal("Period longer than 1 s");

			break;

		case 'P':

			retval = parse_prio(optarg, &params->common.sched_param);

			if (retval == -1)

				fatal("Invalid -P priority");

			params->common.set_sched = 1;

			break;

		case 'q':

			params->common.quiet = 1;

			break;