perf tools: fix event parsing of comma-separated tracepoint events
PATCH 1/1 perf tools: fix event parsing of comma-separated tracepoint events
There are number of issues that prevent the use of multiple tracepoint events being specified in a -e/--event switch, separated by commas.
For example, perf stat -e irq:irq_handler_entry,irq:irq_handler_exit ... fails because the tracepoint event parsing code doesn't recognize the comma separator properly.
This patch corrects those issues.
--- tools/perf/util/parse-events.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-)
tools/perf/util/parse-events.c +8 -4
@@ -434,7 +434,7 @@ parse_single_tracepoint_event(char *sys_name, id =atoll (id_buf); attr->config = id; attr->type =PERF_TYPE_TRACEPOINT ; - *strp = evt_name + evt_length; + *strp +=strlen (sys_name) + evt_length +1 ;/* + 1 for the ':' */ attr->sample_type |=PERF_SAMPLE_RAW ; attr->sample_type |=PERF_SAMPLE_TIME ;
@@ -495,7 +495,7 @@ static enum event_result parse_tracepoint_event(const char **strp, struct perf_event_attr *attr) {const char *evt_name; -char *flags; +char *flags =NULL , *comma_loc;char sys_name[MAX_EVENT_LENGTH ];unsigned int sys_length, evt_length;
@@ -514,6 +514,11 @@ static enum event_result parse_tracepoint_event(const char **strp, sys_name[sys_length] ='\0' ; evt_name = evt_name +1 ; + comma_loc =strchr (evt_name,',' ); +if (comma_loc) { +/* take the event name up to the comma */ + evt_name =strndup (evt_name, comma_loc - evt_name); + } flags =strchr (evt_name,':' );if (flags) {/* split it out: */
@@ -524,9 +529,8 @@ static enum event_result parse_tracepoint_event(const char **strp, evt_length =strlen (evt_name);if (evt_length >=MAX_EVENT_LENGTH )return EVT_FAILED ; -if (strpbrk (evt_name,"*?" )) { - *strp = evt_name + evt_length; + *strp +=strlen (sys_name) + evt_length;return parse_multiple_tracepoint_event (sys_name, evt_name, flags); }else
Signature · 1 line
1.7.3.2
Arnaldo Carvalho de Melo
AppliedEm Tue, Nov 30, 2010 at 02:27:01PM -0800, Corey Ashford escreveu:
Quoted 8 lines
There are number of issues that prevent the use of multiple tracepoint events being specified in a -e/--event switch, separated by commas.
For example, perf stat -e irq:irq_handler_entry,irq:irq_handler_exit ... fails because the tracepoint event parsing code doesn't recognize the comma separator properly.
This patch corrects those issues.
Thanks, applied.
- Arnaldo
Commit-ID: 4c635a4e04700a371ef7e4d4bb33ed88747e801e Gitweb: http://git.kernel.org/tip/4c635a4e04700a371ef7e4d4bb33ed88747e801e Author: Corey Ashford <[email protected]> AuthorDate: Tue, 30 Nov 2010 14:27:01 -0800 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Tue, 30 Nov 2010 23:04:39 -0200
perf tools: fix event parsing of comma-separated tracepoint events
There are number of issues that prevent the use of multiple tracepoint events being specified in a -e/--event switch, separated by commas.
For example, perf stat -e irq:irq_handler_entry,irq:irq_handler_exit ... fails because the tracepoint event parsing code doesn't recognize the comma separator properly.
This patch corrects those issues.
LKML-Reference: <[email protected]>
--- tools/perf/util/parse-events.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-)
tools/perf/util/parse-events.c +8 -4
@@ -434,7 +434,7 @@ parse_single_tracepoint_event(char *sys_name, id =atoll (id_buf); attr->config = id; attr->type =PERF_TYPE_TRACEPOINT ; - *strp = evt_name + evt_length; + *strp +=strlen (sys_name) + evt_length +1 ;/* + 1 for the ':' */ attr->sample_type |=PERF_SAMPLE_RAW ; attr->sample_type |=PERF_SAMPLE_TIME ;
@@ -495,7 +495,7 @@ static enum event_result parse_tracepoint_event(const char **strp, struct perf_event_attr *attr) {const char *evt_name; -char *flags; +char *flags =NULL , *comma_loc;char sys_name[MAX_EVENT_LENGTH ];unsigned int sys_length, evt_length;
@@ -514,6 +514,11 @@ static enum event_result parse_tracepoint_event(const char **strp, sys_name[sys_length] ='\0' ; evt_name = evt_name +1 ; + comma_loc =strchr (evt_name,',' ); +if (comma_loc) { +/* take the event name up to the comma */ + evt_name =strndup (evt_name, comma_loc - evt_name); + } flags =strchr (evt_name,':' );if (flags) {/* split it out: */
@@ -524,9 +529,8 @@ static enum event_result parse_tracepoint_event(const char **strp, evt_length =strlen (evt_name);if (evt_length >=MAX_EVENT_LENGTH )return EVT_FAILED ; -if (strpbrk (evt_name,"*?" )) { - *strp = evt_name + evt_length; + *strp +=strlen (sys_name) + evt_length;return parse_multiple_tracepoint_event (sys_name, evt_name, flags); }else