[PATCH v2 07/14] tools/perf: extend format_alias() to include event parameters
From: Sukadev Bhattiprolu <hidden>
Date: 2014-08-15 07:28:51
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 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 <redacted> CC: Cody P Schafer <redacted> Signed-off-by: Cody P Schafer <redacted> Signed-off-by: Sukadev Bhattiprolu <redacted> --- 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