Messages in this thread Patch in this message | | | From | He Kuang <> | Subject | [PATCH v2 3/4] perf tools: Adds the tracepoint name parsing support | Date | Fri, 25 Sep 2015 11:11:50 +0000 |
| |
Adds rules for parsing tracepoint names. Change rules of tracepoint which derives of PE_NAMEs into tracepoint names directly, so adding more rules based on tracepoint names will be easier.
Signed-off-by: He Kuang <hekuang@huawei.com> --- tools/perf/util/parse-events.y | 38 +++++++++++++++++++++++--------------- 1 file changed, 23 insertions(+), 15 deletions(-)
diff --git a/tools/perf/util/parse-events.y b/tools/perf/util/parse-events.y index 8bcc458..279c01c 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 <head> event_legacy_cache %type <head> event_legacy_mem %type <head> event_legacy_tracepoint +%type <tracepoint_name> __event_legacy_tracepoint %type <head> event_legacy_numeric %type <head> event_legacy_raw %type <head> 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,39 @@ PE_PREFIX_MEM PE_VALUE sep_dc } event_legacy_tracepoint: -PE_NAME '-' PE_NAME ':' PE_NAME +__event_legacy_tracepoint { 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; } + +__event_legacy_tracepoint: +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; - - ALLOC_LIST(list); - if (parse_events_add_tracepoint(list, &data->idx, $1, $3, error)) { - if (error) - error->idx = @1.first_column; - return -1; - } - $$ = list; + struct tracepoint_name tracepoint = {$1, $3}; + $$ = tracepoint; } event_legacy_numeric: -- 1.8.5.2
| |