Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757211AbaAIJXY (ORCPT ); Thu, 9 Jan 2014 04:23:24 -0500 Received: from cn.fujitsu.com ([222.73.24.84]:53425 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1753868AbaAIJWN (ORCPT ); Thu, 9 Jan 2014 04:22:13 -0500 X-IronPort-AV: E=Sophos;i="4.95,630,1384272000"; d="scan'208";a="9395606" From: Dongsheng Yang To: linux-kernel@vger.kernel.org, acme@redhat.com Cc: dsahern@gmail.com, artagnon@gmail.com, Dongsheng Yang Subject: [PATCH 3/7] perf tools: Improve the message of perf list for unexpected input. Date: Thu, 9 Jan 2014 17:19:53 -0500 Message-Id: <10613586eec6ecf42e71bef2241b46debb5d7436.1389305623.git.yangds.fnst@cn.fujitsu.com> X-Mailer: git-send-email 1.8.2.1 In-Reply-To: References: X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2014/01/09 17:21:03, Serialize by Router on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2014/01/09 17:21:05, Serialize complete at 2014/01/09 17:21:05 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Example: # perf list test List of pre-defined events (to be used in -e): # echo $? 0 Verification: # 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 --- 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..1aac451 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("\n'%s' is not a valid event type, please see the usage below for acceptable ones.\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 majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/