Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751632AbaLCCLC (ORCPT ); Tue, 2 Dec 2014 21:11:02 -0500 Received: from e8.ny.us.ibm.com ([32.97.182.138]:57726 "EHLO e8.ny.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751262AbaLCCKD (ORCPT ); Tue, 2 Dec 2014 21:10:03 -0500 From: Sukadev Bhattiprolu To: Arnaldo Carvalho de Melo , Jiri Olsa , Michael Ellerman , Paul Mackerras Cc: dev@codyps.com, peterz@infradead.org, hbabu@us.ibm.com, , linuxppc-dev@lists.ozlabs.org Subject: [PATCH v5 2/4] tools/perf: extend format_alias() to include event parameters Date: Tue, 2 Dec 2014 18:09:36 -0800 Message-Id: <1417572578-9051-3-git-send-email-sukadev@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1417572578-9051-1-git-send-email-sukadev@linux.vnet.ibm.com> References: <1417572578-9051-1-git-send-email-sukadev@linux.vnet.ibm.com> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 14120302-0029-0000-0000-0000014A37FD Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Cody P Schafer 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 CC: Cody P Schafer Signed-off-by: Cody P Schafer Signed-off-by: Sukadev Bhattiprolu --- 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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/