From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754186Ab3L3CfP (ORCPT ); Sun, 29 Dec 2013 21:35:15 -0500 Received: from cn.fujitsu.com ([222.73.24.84]:17195 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1753879Ab3L3CfK (ORCPT ); Sun, 29 Dec 2013 21:35:10 -0500 X-IronPort-AV: E=Sophos;i="4.95,571,1384272000"; d="scan'208";a="9348177" From: Dongsheng Yang To: linux-kernel@vger.kernel.org, acme@redhat.com Cc: mingo@kernel.org, dsahern@gmail.com, artagnon@gmail.com, Dongsheng Yang Subject: [PATCH 6/8] perf tools: Make --raw-dump work as a proper option for perf list. Date: Mon, 30 Dec 2013 10:26:41 -0500 Message-Id: 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 2013/12/30 10:27:57, Serialize by Router on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/12/30 10:27:58, Serialize complete at 2013/12/30 10:27:58 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Ramkumar reported that perf list --raw-dump was broken by 44d742e. Fix by making raw-dump a proper argument. Signed-off-by: David Ahern Signed-off-by: Ramkumar Ramachandra Signed-off-by: Dongsheng Yang Cc: Ramkumar Ramachandra Cc: Arnaldo Carvalho de Melo --- tools/perf/builtin-list.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/tools/perf/builtin-list.c b/tools/perf/builtin-list.c index fed6792..ec90d0a 100644 --- a/tools/perf/builtin-list.c +++ b/tools/perf/builtin-list.c @@ -19,8 +19,10 @@ int cmd_list(int argc, const char **argv, const char *prefix __maybe_unused) { int i; + bool raw_dump = false; unsigned int count = 0; const struct option list_options[] = { + OPT_BOOLEAN(0, "raw-dump", &raw_dump, "raw dump for completion"), OPT_END() }; const char * const list_usage[] = { @@ -34,7 +36,7 @@ int cmd_list(int argc, const char **argv, const char *prefix __maybe_unused) setup_pager(); if (argc == 0) { - print_events(NULL, false); + print_events(NULL, raw_dump); return 0; } @@ -42,26 +44,24 @@ int cmd_list(int argc, const char **argv, const char *prefix __maybe_unused) if (i) putchar('\n'); if (strncmp(argv[i], "tracepoint", 10) == 0) - count += print_tracepoint_events(NULL, NULL, false); + count += print_tracepoint_events(NULL, NULL, raw_dump); else if (strcmp(argv[i], "hw") == 0 || strcmp(argv[i], "hardware") == 0) - count += print_events_type(PERF_TYPE_HARDWARE); + count += print_events_type(PERF_TYPE_HARDWARE, raw_dump); else if (strcmp(argv[i], "sw") == 0 || strcmp(argv[i], "software") == 0) - count += print_events_type(PERF_TYPE_SOFTWARE); + count += print_events_type(PERF_TYPE_SOFTWARE, raw_dump); else if (strcmp(argv[i], "cache") == 0 || strcmp(argv[i], "hwcache") == 0) - count += print_hwcache_events(NULL, false); + count += print_hwcache_events(NULL, raw_dump); else if (strcmp(argv[i], "pmu") == 0) - count += print_pmu_events(NULL, false); - else if (strcmp(argv[i], "--raw-dump") == 0) - count += print_events(NULL, true); + count += print_pmu_events(NULL, raw_dump); else { char *sep = strchr(argv[i], ':'), *s; int sep_idx; if (sep == NULL) { - if(!(count += print_events(argv[i], false))) + if(!(count += print_events(argv[i], raw_dump))) goto err_out; continue; } @@ -71,7 +71,7 @@ int cmd_list(int argc, const char **argv, const char *prefix __maybe_unused) return -1; s[sep_idx] = '\0'; - if (!(count += print_tracepoint_events(s, s + sep_idx + 1, false))) + if (!(count += print_tracepoint_events(s, s + sep_idx + 1, raw_dump))) goto err_out; free(s); } -- 1.8.2.1