A long time ago, when the usage help was short, it was a favor
to the user to show it on error. Now that the usage help has
become very long, it is too noisy to dump the complete help text
for each typo after the error message itself.
Replace timerlat_top_usage("...") with fatal("...") on errors.
Remove the already unused 'usage' argument from timerlat_top_usage().
Signed-off-by: Costa Shulyupin <[email protected]>
---
tools/tracing/rtla/src/timerlat_top.c | 32 +++++++++++----------------
1 file changed, 13 insertions(+), 19 deletions(-)
diff --git a/tools/tracing/rtla/src/timerlat_top.c
b/tools/tracing/rtla/src/timerlat_top.c
index 03ecc38d0719..81b9c8c59c06 100644
--- a/tools/tracing/rtla/src/timerlat_top.c
+++ b/tools/tracing/rtla/src/timerlat_top.c
@@ -476,7 +476,7 @@ timerlat_print_stats(struct osnoise_tool *top)
/*
* timerlat_top_usage - prints timerlat top usage message
*/
-static void timerlat_top_usage(char *usage)
+static void timerlat_top_usage(void)
{
int i;
@@ -524,18 +524,12 @@ static void timerlat_top_usage(char *usage)
NULL,
};
- if (usage)
- fprintf(stderr, "%s\n", usage);
-
fprintf(stderr, "rtla timerlat top: a per-cpu summary of the timer
latency (version %s)\n",
VERSION);
for (i = 0; msg[i]; i++)
fprintf(stderr, "%s\n", msg[i]);
- if (usage)
- exit(EXIT_FAILURE);
-
exit(EXIT_SUCCESS);
}
@@ -648,7 +642,7 @@ static struct common_params
case 'c':
retval = parse_cpu_set(optarg,
¶ms->common.monitored_cpus);
if (retval)
- timerlat_top_usage("\nInvalid -c cpu list\n");
+ fatal("\nInvalid -c cpu list\n");
params->common.cpus = optarg;
break;
case 'C':
@@ -667,12 +661,12 @@ static struct common_params
case 'd':
params->common.duration =
parse_seconds_duration(optarg);
if (!params->common.duration)
- timerlat_top_usage("Invalid -d duration\n");
+ fatal("Invalid -d duration\n");
break;
case 'e':
tevent = trace_event_alloc(optarg);
if (!tevent)
- fatal("Error alloc trace event");
+ fatal("Error alloc trace event\n");
if (params->common.events)
tevent->next = params->common.events;
@@ -680,7 +674,7 @@ static struct common_params
break;
case 'h':
case '?':
- timerlat_top_usage(NULL);
+ timerlat_top_usage();
break;
case 'H':
params->common.hk_cpus = 1;
@@ -700,12 +694,12 @@ static struct common_params
case 'p':
params->timerlat_period_us = get_llong_from_str(optarg);
if (params->timerlat_period_us > 1000000)
- timerlat_top_usage("Period longer than 1 s\n");
+ fatal("Period longer than 1 s\n");
break;
case 'P':
retval = parse_prio(optarg,
¶ms->common.sched_param);
if (retval == -1)
- timerlat_top_usage("Invalid -P priority");
+ fatal("Invalid -P priority\n");
params->common.set_sched = 1;
break;
case 'q':
@@ -740,7 +734,7 @@ static struct common_params
if (retval)
fatal("Error adding trigger %s\n",
optarg);
} else {
- timerlat_top_usage("--trigger requires a
previous -e\n");
+ fatal("--trigger requires a previous -e\n");
}
break;
case '1': /* filter */
@@ -749,13 +743,13 @@ static struct common_params
if (retval)
fatal("Error adding filter %s\n",
optarg);
} else {
- timerlat_top_usage("--filter requires a
previous -e\n");
+ fatal("--filter requires a previous -e\n");
}
break;
case '2': /* dma-latency */
params->dma_latency = get_llong_from_str(optarg);
if (params->dma_latency < 0 || params->dma_latency >
10000)
- fatal("--dma-latency needs to be >= 0 and <
10000");
+ fatal("--dma-latency needs to be >= 0 and <
10000\n");
break;
case '3': /* no-aa */
params->no_aa = 1;
@@ -785,7 +779,7 @@ static struct common_params
fatal("Invalid action %s\n", optarg);
break;
default:
- timerlat_top_usage("Invalid option");
+ fatal("Invalid option\n");
}
}
@@ -802,10 +796,10 @@ static struct common_params
params->no_aa = 1;
if (params->no_aa && params->common.aa_only)
- timerlat_top_usage("--no-aa and --aa-only are mutually
exclusive!");
+ fatal("--no-aa and --aa-only are mutually exclusive!\n");
if (params->common.kernel_workload && params->common.user_workload)
- timerlat_top_usage("--kernel-threads and --user-threads are
mutually exclusive!");
+ fatal("--kernel-threads and --user-threads are mutually
exclusive!\n");
/*
* If auto-analysis or trace output is enabled, switch from BPF mode to
--
2.51.0
