[PATCH v5 2/4] tools/perf: extend format_alias() to include event parameters
From: Sukadev Bhattiprolu <hidden>
Date: 2014-12-03 02:11:02
Also in:
lkml
Subsystem:
performance events subsystem, the rest · Maintainers:
Peter Zijlstra, Ingo Molnar, Arnaldo Carvalho de Melo, Namhyung Kim, Linus Torvalds
From: Cody P Schafer <redacted> This causes `perf list pmu` to show parameters for parameterized events like: pmu/event_name,param1=$param1,param2=$param2/ [Kernel PMU event] Example: hv_24x7/HPM_TLBIE__PHYS_CORE,starting_index=$core/ [Kernel PMU event] Changelog[v5] [Jiri Olsa, Peter Zijlstra] Use '$' to prefix parameterized events. Changelog[v4] [Jiri Olsa] If the parameter for an event in sysfs is 'param=val', have perf-list show the event as 'param=?' rather than 'val=?'. CC: Haren Myneni <redacted> CC: Cody P Schafer <redacted> Signed-off-by: Cody P Schafer <redacted> Signed-off-by: Sukadev Bhattiprolu <redacted> --- tools/perf/util/pmu.c | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-)
diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c
index cb516dd..f8674c1 100644
--- a/tools/perf/util/pmu.c
+++ b/tools/perf/util/pmu.c@@ -810,10 +810,35 @@ 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; }
--
1.8.3.1