From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756107AbbI2IvQ (ORCPT ); Tue, 29 Sep 2015 04:51:16 -0400 Received: from terminus.zytor.com ([198.137.202.10]:38027 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755973AbbI2Iuo (ORCPT ); Tue, 29 Sep 2015 04:50:44 -0400 Date: Tue, 29 Sep 2015 01:50:26 -0700 From: tip-bot for He Kuang Message-ID: Cc: tglx@linutronix.de, acme@redhat.com, hekuang@huawei.com, kan.liang@intel.com, linux-kernel@vger.kernel.org, mingo@kernel.org, a.p.zijlstra@chello.nl, adrian.hunter@intel.com, jolsa@kernel.org, hpa@zytor.com, wangnan0@huawei.com Reply-To: tglx@linutronix.de, acme@redhat.com, hekuang@huawei.com, kan.liang@intel.com, mingo@kernel.org, linux-kernel@vger.kernel.org, a.p.zijlstra@chello.nl, jolsa@kernel.org, adrian.hunter@intel.com, hpa@zytor.com, wangnan0@huawei.com In-Reply-To: <1443412336-120050-3-git-send-email-hekuang@huawei.com> References: <1443412336-120050-3-git-send-email-hekuang@huawei.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf tools: Adds the tracepoint name parsing support Git-Commit-ID: 865582c3f48e12b7ab9e260161868313e4a37f44 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: 865582c3f48e12b7ab9e260161868313e4a37f44 Gitweb: http://git.kernel.org/tip/865582c3f48e12b7ab9e260161868313e4a37f44 Author: He Kuang AuthorDate: Mon, 28 Sep 2015 03:52:15 +0000 Committer: Arnaldo Carvalho de Melo CommitDate: Mon, 28 Sep 2015 17:29:38 -0300 perf tools: Adds the tracepoint name parsing support Adds rules for parsing tracepoint names. Change rules of tracepoint which derives from PE_NAMEs into tracepoint names directly, so adding more rules based on tracepoint names will be easier. Changes v2-v3: - Change __event_legacy_tracepoint label in bison file to tracepoint_name - Fix formats error. Signed-off-by: He Kuang Acked-by: Jiri Olsa Cc: Adrian Hunter Cc: Kan Liang Cc: Peter Zijlstra Cc: Wang Nan Cc: pi3orama@163.com Link: http://lkml.kernel.org/r/1443412336-120050-3-git-send-email-hekuang@huawei.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/parse-events.y | 37 +++++++++++++++++++++++-------------- 1 file changed, 23 insertions(+), 14 deletions(-) diff --git a/tools/perf/util/parse-events.y b/tools/perf/util/parse-events.y index 8bcc458..1c598c2 100644 --- a/tools/perf/util/parse-events.y +++ b/tools/perf/util/parse-events.y @@ -67,6 +67,7 @@ static inc_group_count(struct list_head *list, %type event_legacy_cache %type event_legacy_mem %type event_legacy_tracepoint +%type tracepoint_name %type event_legacy_numeric %type event_legacy_raw %type event_def @@ -84,6 +85,10 @@ static inc_group_count(struct list_head *list, u64 num; struct list_head *head; struct parse_events_term *term; + struct tracepoint_name { + char *sys; + char *event; + } tracepoint_name; } %% @@ -368,36 +373,40 @@ PE_PREFIX_MEM PE_VALUE sep_dc } event_legacy_tracepoint: -PE_NAME '-' PE_NAME ':' PE_NAME +tracepoint_name { struct parse_events_evlist *data = _data; struct parse_events_error *error = data->error; struct list_head *list; - char sys_name[128]; - snprintf(&sys_name, 128, "%s-%s", $1, $3); ALLOC_LIST(list); - if (parse_events_add_tracepoint(list, &data->idx, &sys_name, $5, error)) { + if (parse_events_add_tracepoint(list, &data->idx, $1.sys, $1.event, + error)) { if (error) error->idx = @1.first_column; return -1; } $$ = list; } + +tracepoint_name: +PE_NAME '-' PE_NAME ':' PE_NAME +{ + char sys_name[128]; + struct tracepoint_name tracepoint; + + snprintf(&sys_name, 128, "%s-%s", $1, $3); + tracepoint.sys = &sys_name; + tracepoint.event = $5; + + $$ = tracepoint; +} | PE_NAME ':' PE_NAME { - struct parse_events_evlist *data = _data; - struct parse_events_error *error = data->error; - struct list_head *list; + struct tracepoint_name tracepoint = {$1, $3}; - ALLOC_LIST(list); - if (parse_events_add_tracepoint(list, &data->idx, $1, $3, error)) { - if (error) - error->idx = @1.first_column; - return -1; - } - $$ = list; + $$ = tracepoint; } event_legacy_numeric: