From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758300AbcBTLie (ORCPT ); Sat, 20 Feb 2016 06:38:34 -0500 Received: from terminus.zytor.com ([198.137.202.10]:38173 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758283AbcBTLib (ORCPT ); Sat, 20 Feb 2016 06:38:31 -0500 Date: Sat, 20 Feb 2016 03:37:36 -0800 From: tip-bot for Wang Nan Message-ID: Cc: brendan.d.gregg@gmail.com, masami.hiramatsu.pt@hitachi.com, lizefan@huawei.com, jolsa@kernel.org, tglx@linutronix.de, wangnan0@huawei.com, linux-kernel@vger.kernel.org, kirr@nexedi.com, peterz@infradead.org, mingo@kernel.org, acme@redhat.com, ast@kernel.org, dev@codyps.com, jeremie.galarneau@efficios.com, namhyung@kernel.org, hekuang@huawei.com, adrian.hunter@intel.com, hpa@zytor.com Reply-To: dev@codyps.com, hekuang@huawei.com, adrian.hunter@intel.com, hpa@zytor.com, jeremie.galarneau@efficios.com, namhyung@kernel.org, mingo@kernel.org, wangnan0@huawei.com, linux-kernel@vger.kernel.org, kirr@nexedi.com, peterz@infradead.org, ast@kernel.org, acme@redhat.com, lizefan@huawei.com, tglx@linutronix.de, jolsa@kernel.org, brendan.d.gregg@gmail.com, masami.hiramatsu.pt@hitachi.com In-Reply-To: <1455882283-79592-12-git-send-email-wangnan0@huawei.com> References: <1455882283-79592-12-git-send-email-wangnan0@huawei.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf tools: Rename and move pmu_event_name to get_config_name Git-Commit-ID: e814fddde18fec43fa41a27ae94c09b54772697e 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: e814fddde18fec43fa41a27ae94c09b54772697e Gitweb: http://git.kernel.org/tip/e814fddde18fec43fa41a27ae94c09b54772697e Author: Wang Nan AuthorDate: Fri, 19 Feb 2016 11:43:59 +0000 Committer: Arnaldo Carvalho de Melo CommitDate: Fri, 19 Feb 2016 19:12:50 -0300 perf tools: Rename and move pmu_event_name to get_config_name Following commits will make more events obey /name=newname/ options. This patch makes pmu_event_name() a generic helper. Makes new get_config_name() accept NULL input to make life easier. Signed-off-by: Wang Nan Cc: Adrian Hunter Cc: Alexei Starovoitov Cc: Brendan Gregg Cc: Cody P Schafer Cc: He Kuang Cc: Jeremie Galarneau Cc: Jiri Olsa Cc: Kirill Smelkov Cc: Li Zefan Cc: Masami Hiramatsu Cc: Namhyung Kim Cc: Peter Zijlstra Cc: Zefan Li Cc: pi3orama@163.com Link: http://lkml.kernel.org/r/1455882283-79592-12-git-send-email-wangnan0@huawei.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/parse-events.c | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c index eb5df43..3243e95 100644 --- a/tools/perf/util/parse-events.c +++ b/tools/perf/util/parse-events.c @@ -279,7 +279,24 @@ const char *event_type(int type) return "unknown"; } +static int parse_events__is_name_term(struct parse_events_term *term) +{ + return term->type_term == PARSE_EVENTS__TERM_TYPE_NAME; +} +static char *get_config_name(struct list_head *head_terms) +{ + struct parse_events_term *term; + + if (!head_terms) + return NULL; + + list_for_each_entry(term, head_terms, list) + if (parse_events__is_name_term(term)) + return term->val.str; + + return NULL; +} static struct perf_evsel * __add_event(struct list_head *list, int *idx, @@ -1029,22 +1046,6 @@ int parse_events_add_numeric(struct parse_events_evlist *data, return add_event(list, &data->idx, &attr, NULL, &config_terms); } -static int parse_events__is_name_term(struct parse_events_term *term) -{ - return term->type_term == PARSE_EVENTS__TERM_TYPE_NAME; -} - -static char *pmu_event_name(struct list_head *head_terms) -{ - struct parse_events_term *term; - - list_for_each_entry(term, head_terms, list) - if (parse_events__is_name_term(term)) - return term->val.str; - - return NULL; -} - int parse_events_add_pmu(struct parse_events_evlist *data, struct list_head *list, char *name, struct list_head *head_config) @@ -1089,7 +1090,7 @@ int parse_events_add_pmu(struct parse_events_evlist *data, return -EINVAL; evsel = __add_event(list, &data->idx, &attr, - pmu_event_name(head_config), pmu->cpus, + get_config_name(head_config), pmu->cpus, &config_terms); if (evsel) { evsel->unit = info.unit;