Em Mon, Dec 30, 2013 at 10:26:39AM -0500, Dongsheng Yang escreveu:
> Example:
> # perf list test
>
> List of pre-defined events (to be used in -e):
> # echo $?
> 0
>
> Verification:
> # perf list test
>
> No event for test.
?
Are we "testing" events?
The message is not clear, I can get some info from looking at the Usage,
but not from 'No event for test'.
At a minimum 'test' (whatevet invalid type/class is specified and found
to be invalid/unknown) should be quoted.
Perhaps the message should be along the lines of:
# perf list test
'test' is not a valid event type, please see the usage below for
acceptable ones.
> Usage:
> perf list [hw|sw|cache|tracepoint|pmu|event_glob]
> # echo $?
> 255
>
> Signed-off-by: Dongsheng Yang <yangds.f...@cn.fujitsu.com>
> ---
> tools/perf/builtin-list.c | 25 +++++++++++++++++--------
> 1 file changed, 17 insertions(+), 8 deletions(-)
>
> diff --git a/tools/perf/builtin-list.c b/tools/perf/builtin-list.c
> index 011195e..fed6792 100644
> --- a/tools/perf/builtin-list.c
> +++ b/tools/perf/builtin-list.c
> @@ -19,6 +19,7 @@
> int cmd_list(int argc, const char **argv, const char *prefix __maybe_unused)
> {
> int i;
> + unsigned int count = 0;
> const struct option list_options[] = {
> OPT_END()
> };
> @@ -41,26 +42,27 @@ int cmd_list(int argc, const char **argv, const char
> *prefix __maybe_unused)
> if (i)
> putchar('\n');
> if (strncmp(argv[i], "tracepoint", 10) == 0)
> - print_tracepoint_events(NULL, NULL, false);
> + count += print_tracepoint_events(NULL, NULL, false);
> else if (strcmp(argv[i], "hw") == 0 ||
> strcmp(argv[i], "hardware") == 0)
> - print_events_type(PERF_TYPE_HARDWARE);
> + count += print_events_type(PERF_TYPE_HARDWARE);
> else if (strcmp(argv[i], "sw") == 0 ||
> strcmp(argv[i], "software") == 0)
> - print_events_type(PERF_TYPE_SOFTWARE);
> + count += print_events_type(PERF_TYPE_SOFTWARE);
> else if (strcmp(argv[i], "cache") == 0 ||
> strcmp(argv[i], "hwcache") == 0)
> - print_hwcache_events(NULL, false);
> + count += print_hwcache_events(NULL, false);
> else if (strcmp(argv[i], "pmu") == 0)
> - print_pmu_events(NULL, false);
> + count += print_pmu_events(NULL, false);
> else if (strcmp(argv[i], "--raw-dump") == 0)
> - print_events(NULL, true);
> + count += print_events(NULL, true);
> else {
> char *sep = strchr(argv[i], ':'), *s;
> int sep_idx;
>
> if (sep == NULL) {
> - print_events(argv[i], false);
> + if(!(count += print_events(argv[i], false)))
> + goto err_out;
> continue;
> }
> sep_idx = sep - argv[i];
> @@ -69,9 +71,16 @@ int cmd_list(int argc, const char **argv, const char
> *prefix __maybe_unused)
> return -1;
>
> s[sep_idx] = '\0';
> - print_tracepoint_events(s, s + sep_idx + 1, false);
> + if (!(count += print_tracepoint_events(s, s + sep_idx +
> 1, false)))
> + goto err_out;
> free(s);
> }
> }
> +
> return 0;
> +
> +err_out:
> + pr_info("\nNo event for %s.\n", argv[i]);
> + pr_info("Usage:\n\t%s\n", list_usage[0]);
> + return -1;
> }
> --
> 1.8.2.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
