Commit-ID: aaea36174991ff39c7a18044660db86527100c55 Gitweb: http://git.kernel.org/tip/aaea36174991ff39c7a18044660db86527100c55 Author: Cody P Schafer <c...@linux.vnet.ibm.com> AuthorDate: Wed, 7 Jan 2015 17:13:51 -0800 Committer: Arnaldo Carvalho de Melo <a...@redhat.com> CommitDate: Wed, 21 Jan 2015 13:24:33 -0300
perf tools: Extend format_alias() to include event parameters This causes `perf list pmu` to show parameters for parameterized events like: pmu/event_name,param1=?,param2=?/ [Kernel PMU event] An example: hv_24x7/HPM_TLBIE__PHYS_CORE,core=?/ [Kernel PMU event] Signed-off-by: Cody P Schafer <c...@linux.vnet.ibm.com> Signed-off-by: Sukadev Bhattiprolu <suka...@linux.vnet.ibm.com> Acked-by: Jiri Olsa <jo...@kernel.org> Cc: Cody P Schafer <d...@codyps.com> Cc: Haren Myneni <hb...@us.ibm.com> Cc: Jiri Olsa <jo...@redhat.com> Cc: Michael Ellerman <m...@ellerman.id.au> Cc: Paul Mackerras <pau...@samba.org> Cc: Peter Zijlstra <pet...@infradead.org> Cc: linuxppc-...@lists.ozlabs.org Link: http://lkml.kernel.org/r/1420679633-28856-3-git-send-email-suka...@linux.vnet.ibm.com Signed-off-by: Arnaldo Carvalho de Melo <a...@redhat.com> --- tools/perf/util/pmu.c | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c index bfbecf7..4841167 100644 --- a/tools/perf/util/pmu.c +++ b/tools/perf/util/pmu.c @@ -819,10 +819,36 @@ 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=%s", term->config, + 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; } -- 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/
