From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759582AbcBYHhM (ORCPT ); Thu, 25 Feb 2016 02:37:12 -0500 Received: from torg.zytor.com ([198.137.202.12]:56758 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1758667AbcBYHhK (ORCPT ); Thu, 25 Feb 2016 02:37:10 -0500 Date: Wed, 24 Feb 2016 23:36:51 -0800 From: tip-bot for Jiri Olsa Message-ID: Cc: dsahern@gmail.com, a.p.zijlstra@chello.nl, eranian@google.com, hpa@zytor.com, linux-kernel@vger.kernel.org, ak@linux.intel.com, jolsa@kernel.org, tglx@linutronix.de, acme@redhat.com, namhyung@kernel.org, mingo@kernel.org Reply-To: hpa@zytor.com, eranian@google.com, a.p.zijlstra@chello.nl, dsahern@gmail.com, namhyung@kernel.org, mingo@kernel.org, acme@redhat.com, tglx@linutronix.de, jolsa@kernel.org, linux-kernel@vger.kernel.org, ak@linux.intel.com In-Reply-To: <1456303616-26926-3-git-send-email-jolsa@kernel.org> References: <1456303616-26926-3-git-send-email-jolsa@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf mem: Introduce perf_mem_events__name function Git-Commit-ID: 2ba7ac5814a6952aad647ce31696b893772cbe83 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 2ba7ac5814a6952aad647ce31696b893772cbe83 Gitweb: http://git.kernel.org/tip/2ba7ac5814a6952aad647ce31696b893772cbe83 Author: Jiri Olsa AuthorDate: Wed, 24 Feb 2016 09:46:43 +0100 Committer: Arnaldo Carvalho de Melo CommitDate: Wed, 24 Feb 2016 10:11:52 -0300 perf mem: Introduce perf_mem_events__name function Wrap perf_mem_events[].name into perf_mem_events__name() so we could alter the events name if needed. This will be handy when changing latency settings for loads event in following patch. Signed-off-by: Jiri Olsa Cc: Andi Kleen Cc: David Ahern Cc: Namhyung Kim Cc: Peter Zijlstra Cc: Stephane Eranian Link: http://lkml.kernel.org/r/1456303616-26926-3-git-send-email-jolsa@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/builtin-mem.c | 6 +++--- tools/perf/util/mem-events.c | 5 +++++ tools/perf/util/mem-events.h | 1 + 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/tools/perf/builtin-mem.c b/tools/perf/builtin-mem.c index f1fa7b8..88aeac9 100644 --- a/tools/perf/builtin-mem.c +++ b/tools/perf/builtin-mem.c @@ -43,7 +43,7 @@ static int parse_record_events(const struct option *opt, fprintf(stderr, "%-13s%-*s%s\n", e->tag, verbose ? 25 : 0, - verbose ? e->name : "", + verbose ? perf_mem_events__name(j) : "", e->supported ? ": available" : ""); } exit(0); @@ -95,12 +95,12 @@ static int __cmd_record(int argc, const char **argv, struct perf_mem *mem) if (!perf_mem_events[j].supported) { pr_err("failed: event '%s' not supported\n", - perf_mem_events[j].name); + perf_mem_events__name(j)); return -1; } rec_argv[i++] = "-e"; - rec_argv[i++] = perf_mem_events[j].name; + rec_argv[i++] = perf_mem_events__name(j); }; for (j = 0; j < argc; j++, i++) diff --git a/tools/perf/util/mem-events.c b/tools/perf/util/mem-events.c index e21853f..2330db5 100644 --- a/tools/perf/util/mem-events.c +++ b/tools/perf/util/mem-events.c @@ -19,6 +19,11 @@ struct perf_mem_event perf_mem_events[PERF_MEM_EVENTS__MAX] = { #undef E +char *perf_mem_events__name(int i) +{ + return (char *)perf_mem_events[i].name; +} + int perf_mem_events__parse(const char *str) { char *tok, *saveptr = NULL; diff --git a/tools/perf/util/mem-events.h b/tools/perf/util/mem-events.h index 75c1660..2a91b95 100644 --- a/tools/perf/util/mem-events.h +++ b/tools/perf/util/mem-events.h @@ -22,4 +22,5 @@ extern struct perf_mem_event perf_mem_events[PERF_MEM_EVENTS__MAX]; int perf_mem_events__parse(const char *str); int perf_mem_events__init(void); +char *perf_mem_events__name(int i); #endif /* __PERF_MEM_EVENTS_H */