From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754294AbbFEVQK (ORCPT ); Fri, 5 Jun 2015 17:16:10 -0400 Received: from mga09.intel.com ([134.134.136.24]:30183 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752003AbbFEVOv (ORCPT ); Fri, 5 Jun 2015 17:14:51 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.13,560,1427785200"; d="scan'208";a="582921737" From: Andi Kleen To: sukadev@linux.vnet.ibm.com Cc: jolsa@redhat.com, acme@kernel.org, linux-kernel@vger.kernel.org, Andi Kleen Subject: [PATCH 4/5] perf, tools: Add debug support for outputing alias string Date: Fri, 5 Jun 2015 14:14:37 -0700 Message-Id: <1433538878-13321-5-git-send-email-andi@firstfloor.org> X-Mailer: git-send-email 2.4.2 In-Reply-To: <1433538878-13321-1-git-send-email-andi@firstfloor.org> References: <1433538878-13321-1-git-send-email-andi@firstfloor.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Andi Kleen For debugging and testing it is useful to see the converted alias string. Add support to perf stat/record and perf list to print the alias conversion. The text string is saved in the alias structure. For perf stat/record it is folded into the normal -v. For perf list -v was taken, so we use --debug. Signed-off-by: Andi Kleen --- tools/perf/builtin-list.c | 5 ++++- tools/perf/util/parse-events.y | 3 +++ tools/perf/util/pmu.c | 7 +++++++ tools/perf/util/pmu.h | 1 + 4 files changed, 15 insertions(+), 1 deletion(-) diff --git a/tools/perf/builtin-list.c b/tools/perf/builtin-list.c index d0f7a18..c3c4594 100644 --- a/tools/perf/builtin-list.c +++ b/tools/perf/builtin-list.c @@ -15,6 +15,7 @@ #include "util/cache.h" #include "util/pmu.h" #include "util/parse-options.h" +#include "util/debug.h" static bool desc_flag = true; @@ -29,10 +30,12 @@ int cmd_list(int argc, const char **argv, const char *prefix __maybe_unused) "Print extra event descriptions. --no-desc to not print."), OPT_BOOLEAN('d', "long-desc", &long_desc_flag, "Print longer event descriptions."), + OPT_INCR(0, "debug", &verbose, + "Enable debugging output"), OPT_END() }; const char * const list_usage[] = { - "perf list [--no-desc] [hw|sw|cache|tracepoint|pmu|event_glob]", + "perf list [--no-desc] [-v] [hw|sw|cache|tracepoint|pmu|event_glob]", NULL }; diff --git a/tools/perf/util/parse-events.y b/tools/perf/util/parse-events.y index 12745ce..2b90fb8 100644 --- a/tools/perf/util/parse-events.y +++ b/tools/perf/util/parse-events.y @@ -13,6 +13,7 @@ #include #include "util.h" #include "pmu.h" +#include "debug.h" #include "parse-events.h" #include "parse-events-bison.h" @@ -246,6 +247,8 @@ PE_KERNEL_PMU_EVENT sep_dc if (!strcasecmp(alias->name, $1)) { if (!parse_events_add_pmu(data, list, pmu->name, head)) { + pr_debug("%s -> %s/%s/\n", $1, + pmu->name, alias->str); ok++; } } diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c index dac87bc..788bd9e 100644 --- a/tools/perf/util/pmu.c +++ b/tools/perf/util/pmu.c @@ -247,6 +247,7 @@ static int __perf_pmu__new_alias(struct list_head *list, char *dir, char *name, alias->long_desc = long_desc ? strdup(long_desc) : desc ? strdup(desc) : NULL; alias->topic = topic ? strdup(topic) : NULL; + alias->str = strdup(val); list_add_tail(&alias->list, list); @@ -1023,6 +1024,8 @@ struct sevent { char *name; char *desc; char *topic; + char *str; + char *pmu; }; static int cmp_sevent(const void *a, const void *b) @@ -1116,6 +1119,8 @@ void print_pmu_events(const char *event_glob, bool name_only, bool quiet_flag, aliases[j].desc = long_desc ? alias->long_desc : alias->desc; aliases[j].topic = alias->topic; + aliases[j].str = alias->str; + aliases[j].pmu = pmu->name; j++; } if (pmu->selectable) { @@ -1149,6 +1154,8 @@ void print_pmu_events(const char *event_glob, bool name_only, bool quiet_flag, printf("%*s", 8, "["); wordwrap(aliases[j].desc, 8, columns, 0); printf("]\n"); + if (verbose) + printf("%*s%s/%s/\n", 8, "", aliases[j].pmu, aliases[j].str); } else printf(" %-50s [Kernel PMU event]\n", aliases[j].name); printed++; diff --git a/tools/perf/util/pmu.h b/tools/perf/util/pmu.h index b3fe9b8..92d40c3 100644 --- a/tools/perf/util/pmu.h +++ b/tools/perf/util/pmu.h @@ -41,6 +41,7 @@ struct perf_pmu_alias { char *desc; char *long_desc; char *topic; + char *str; struct list_head terms; /* HEAD struct parse_events_term -> list */ struct list_head list; /* ELEM */ char unit[UNIT_MAX_LEN+1]; -- 2.4.2