From: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
To: Arnaldo Carvalho de Melo <acme@kernel.org>,
ak@linux.intel.com, Jiri Olsa <jolsa@redhat.com>,
peterz@infradead.org, eranian@google.com
Cc: linuxppc-dev@lists.ozlabs.org, dev@codyps.com,
linux-kernel@vger.kernel.org,
Michael Ellerman <michaele@au1.ibm.com>,
Anshuman Khandual <khandual@linux.vnet.ibm.com>
Subject: [PATCH v2 07/14] tools/perf: extend format_alias() to include event parameters
Date: Fri, 15 Aug 2014 00:26:16 -0700 [thread overview]
Message-ID: <1408087583-32239-8-git-send-email-sukadev@linux.vnet.ibm.com> (raw)
In-Reply-To: <1408087583-32239-1-git-send-email-sukadev@linux.vnet.ibm.com>
From: Cody P Schafer <dev@codyps.com>
This causes `perf list pmu` to show parameters for parameterized events
like follows:
pmu/event_name,param1=?,param2=?/ [Kernel PMU event]
An example:
hv_gpci/dispatch_timebase_by_processor_processor_time_in_timebase_cycles,phys_processor_idx=?/ [Kernel PMU event]
CC: Haren Myneni <hbabu@us.ibm.com>
CC: Cody P Schafer <dev@codyps.com>
Signed-off-by: Cody P Schafer <cody@linux.vnet.ibm.com>
Signed-off-by: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
---
tools/perf/util/pmu.c | 26 +++++++++++++++++++++++++-
1 file changed, 25 insertions(+), 1 deletion(-)
diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c
index ee1c190..63ca8b4 100644
--- a/tools/perf/util/pmu.c
+++ b/tools/perf/util/pmu.c
@@ -741,10 +741,33 @@ void perf_pmu__set_format(unsigned long *bits, long from, long to)
set_bit(b, bits);
}
+static int sub_non_neg(int a, int b)
+{
+ if (b > a)
+ return 0;
+ return a - b;
+}
+
static char *format_alias(char *buf, int len, struct perf_pmu *pmu,
struct perf_pmu_alias *alias)
{
- snprintf(buf, len, "%s/%s/", pmu->name, alias->name);
+ struct parse_events_term *term;
+ int used = snprintf(buf, len, "%s/%s", pmu->name, alias->name);
+
+ list_for_each_entry(term, &alias->terms, list)
+ if (term->type_val == PARSE_EVENTS__TERM_TYPE_STR)
+ used += snprintf(buf + used, sub_non_neg(len, used),
+ ",%s=?", term->val.str);
+
+ if (sub_non_neg(len, used) > 0) {
+ buf[used] = '/';
+ used++;
+ }
+ if (sub_non_neg(len, used) > 0) {
+ buf[used] = '\0';
+ used++;
+ } else
+ buf[len - 1] = '\0';
return buf;
}
@@ -795,6 +818,7 @@ void print_pmu_events(const char *event_glob, bool name_only)
if (is_cpu && !name_only)
aliases[j] = format_alias_or(buf, sizeof(buf),
pmu, alias);
+
aliases[j] = strdup(aliases[j]);
j++;
}
--
1.8.3.1
next prev parent reply other threads:[~2014-08-15 7:26 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-15 7:26 [PATCH v2 00/14] Add support for parameterized events from sysfs Sukadev Bhattiprolu
2014-08-15 7:26 ` [PATCH v2 01/14] powerpc/perf/hv-24x7: use kmem_cache instead of aligned stack allocations Sukadev Bhattiprolu
2014-08-15 7:26 ` [PATCH v2 03/14] perf Documentation: sysfs events/ interfaces Sukadev Bhattiprolu
2014-08-15 7:26 ` [PATCH v2 04/14] perf Documentation: remove duplicated docs for powerpc cpu specific events Sukadev Bhattiprolu
2014-08-15 7:26 ` [PATCH v2 04/14] perf Documentation: add event parameters Sukadev Bhattiprolu
2014-08-15 7:26 ` [PATCH v2 05/14] tools/perf: annotate list_head with type info Sukadev Bhattiprolu
2014-08-15 13:47 ` Arnaldo Carvalho de Melo
2014-08-15 7:26 ` [PATCH v2 06/14] tools/perf: support parsing parameterized events Sukadev Bhattiprolu
2014-08-15 7:26 ` Sukadev Bhattiprolu [this message]
2014-08-15 7:26 ` [PATCH v2 08/14] tools/perf: document parameterized events and note symbolically formed events Sukadev Bhattiprolu
2014-08-15 7:26 ` [PATCH v2 09/14] perf: provide sysfs_show for struct perf_pmu_events_attr Sukadev Bhattiprolu
2014-08-15 7:26 ` [PATCH v2 10/14] powerpc/perf/hv-24x7: parse catalog and populate sysfs with events Sukadev Bhattiprolu
2014-08-15 7:26 ` [PATCH v2 11/14] powerpc/perf/hv-24x7: Documentaion for new sysfs entries which expose descriptions Sukadev Bhattiprolu
2014-08-15 7:26 ` [PATCH v2 12/14] perf: add PMU_EVENT_ATTR_STRING() helper Sukadev Bhattiprolu
2014-08-15 7:26 ` [PATCH v2 13/14] powerpc/perf/{hv-gpci, hv-common}: generate requests with counters annotated Sukadev Bhattiprolu
2014-08-15 7:26 ` [PATCH v2 14/14] powerpc/perf/hv-gpci: add the remaining gpci requests Sukadev Bhattiprolu
2014-08-15 7:44 ` [PATCH v2 00/14] Add support for parameterized events from sysfs Peter Zijlstra
2014-08-20 14:15 ` Jiri Olsa
2014-08-23 0:23 ` Sukadev Bhattiprolu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1408087583-32239-8-git-send-email-sukadev@linux.vnet.ibm.com \
--to=sukadev@linux.vnet.ibm.com \
--cc=acme@kernel.org \
--cc=ak@linux.intel.com \
--cc=dev@codyps.com \
--cc=eranian@google.com \
--cc=jolsa@redhat.com \
--cc=khandual@linux.vnet.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=michaele@au1.ibm.com \
--cc=peterz@infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).