Commit aaea3617 authored Jan 07, 2015 by Cody P Schafer Committed by Arnaldo Carvalho de Melo Jan 21, 2015

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 <cody@linux.vnet.ibm.com>
Signed-off-by: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
Acked-by: Jiri Olsa <jolsa@kernel.org>
Cc: Cody P Schafer <dev@codyps.com>
Cc: Haren Myneni <hbabu@us.ibm.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: linuxppc-dev@lists.ozlabs.org
Link: http://lkml.kernel.org/r/1420679633-28856-3-git-send-email-sukadev@linux.vnet.ibm.com


Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

parent 688d4dfc

tools/perf/util/pmu.c

+27 −1

Original line number	Diff line number	Diff line
		@@ -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;
		}

Admin message