perf header: Fix a typo on evsel
Namhyung Kim
maintainerPATCH 1/2 perf header: Fix a typo on evsel
From: Namhyung Kim <[email protected]>
For checking return value of the strdup, 'event' should be 'evsel'.
--- tools/perf/util/header.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/util/header.c +1 -1
@@ -2512,7 +2512,7 @@ static int perf_evsel__set_tracepoint_name(struct perf_evsel *evsel,snprintf (bf,sizeof (bf),"%s:%s" , event->system, event->name); evsel->name =strdup (bf); -if (event->name ==NULL ) +if (evsel->name ==NULL )return -1 ; evsel->tp_format = event;
Signature · 1 line
1.7.11.4
Namhyung Kim
maintainerPATCH 2/2 perf header: Prepare tracepoint events regardless of name
From: Namhyung Kim <[email protected]>
Current perf_evlist__set_tracepoint_names is a misnomer because it finds and sets correspoding event_format in addition to the name. So skipping it when a event has set name already caused a trouble.
Rename it and set name only a event doesn't have one.
---
Arnaldo, I made it incremental for your convenience. But if you want to drop my previous one I can resend with it. Please let me know your preference. :)
tools/perf/util/header.c | 36 ++++++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 14 deletions(-)
tools/perf/util/header.c +22 -14
@@ -2500,33 +2500,39 @@ static int read_attr(int fd, struct perf_header *ph,return ret <=0 ?-1 :0 ; } -static int perf_evsel__set_tracepoint_name (struct perf_evsel *evsel, -struct pevent *pevent) +static int perf_evsel__prepare_tracepoint_event (struct perf_evsel *evsel, +struct pevent *pevent) { -struct event_format *event =pevent_find_event (pevent, - evsel->attr.config); +struct event_format *event;char bf[128 ]; +/* already prepared */ +if (evsel->tp_format) +return 0 ; + + event =pevent_find_event (pevent, evsel->attr.config);if (event ==NULL )return -1 ; -snprintf (bf,sizeof (bf),"%s:%s" , event->system, event->name); - evsel->name =strdup (bf); -if (evsel->name ==NULL ) -return -1 ; +if (!evsel->name) { +snprintf (bf,sizeof (bf),"%s:%s" , event->system, event->name); + evsel->name =strdup (bf); +if (evsel->name ==NULL ) +return -1 ; + } evsel->tp_format = event;return 0 ; } -static int perf_evlist__set_tracepoint_names (struct perf_evlist *evlist, -struct pevent *pevent) +static int perf_evlist__prepare_tracepoint_events (struct perf_evlist *evlist, +struct pevent *pevent) {struct perf_evsel *pos;list_for_each_entry (pos, &evlist->entries, node) { -if (pos->attr.type ==PERF_TYPE_TRACEPOINT && !pos->name && -perf_evsel__set_tracepoint_name (pos, pevent)) +if (pos->attr.type ==PERF_TYPE_TRACEPOINT && +perf_evsel__prepare_tracepoint_event (pos, pevent))return -1 ; }
@@ -2614,7 +2620,8 @@ int perf_session__read_header(struct perf_session *session, int fd)lseek (fd, header->data_offset,SEEK_SET ); -if (perf_evlist__set_tracepoint_names (session->evlist, session->pevent)) +if (perf_evlist__prepare_tracepoint_events (session->evlist, + session->pevent)) goto out_delete_evlist; header->frozen =1 ;
@@ -2848,7 +2855,8 @@ int perf_event__process_tracing_data(union perf_event *event,if (size_read + padding != size)die ("tracing data size mismatch" ); -perf_evlist__set_tracepoint_names (session->evlist, session->pevent); +perf_evlist__prepare_tracepoint_events (session->evlist, + session->pevent);return size_read + padding; }
Signature · 1 line
1.7.11.4
Arnaldo Carvalho de Melo
AppliedRe: [PATCH 2/2] perf header: Prepare tracepoint events regardless of name
Em Thu, Sep 06, 2012 at 11:10:46AM +0900, Namhyung Kim escreveu:
Quoted 6 lines
From: Namhyung Kim <[email protected]>
Current
perf_evlist__set_tracepoint_namesis a misnomer because it finds and sets correspodingevent_formatin addition to the name. So skipping it when a event has set name already caused a trouble.
Quoted 8 lines
Rename it and set name only a event doesn't have one.
Reported-by David Ahern <[email protected]>Signed-off-by Namhyung Kim <[email protected]>---
Arnaldo, I made it incremental for your convenience. But if you want to drop my previous one I can resend with it. Please let me know your preference. :)
I applied this 2-patch series now, thanks.
- Arnaldo
[tip:perf/core] perf header: Prepare tracepoint events regardless of name
In reply to Namhyung KimCommit-ID: 831394bdd9dd3ac1661336505c7cbdfd786d8cd4 Gitweb: http://git.kernel.org/tip/831394bdd9dd3ac1661336505c7cbdfd786d8cd4 Author: Namhyung Kim <[email protected]> AuthorDate: Thu, 6 Sep 2012 11:10:46 +0900 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Thu, 6 Sep 2012 10:51:02 -0300
perf header: Prepare tracepoint events regardless of name
Current perf_evlist__set_tracepoint_names is a misnomer because it finds and sets correspoding event_format in addition to the name. So skipping it when a event has set name already caused a trouble.
Rename it and set name only a event doesn't have one.
--- tools/perf/util/header.c | 36 ++++++++++++++++++++++-------------- 1 files changed, 22 insertions(+), 14 deletions(-)
tools/perf/util/header.c +22 -14
@@ -2295,33 +2295,39 @@ static int read_attr(int fd, struct perf_header *ph,return ret <=0 ?-1 :0 ; } -static int perf_evsel__set_tracepoint_name (struct perf_evsel *evsel, -struct pevent *pevent) +static int perf_evsel__prepare_tracepoint_event (struct perf_evsel *evsel, +struct pevent *pevent) { -struct event_format *event =pevent_find_event (pevent, - evsel->attr.config); +struct event_format *event;char bf[128 ]; +/* already prepared */ +if (evsel->tp_format) +return 0 ; + + event =pevent_find_event (pevent, evsel->attr.config);if (event ==NULL )return -1 ; -snprintf (bf,sizeof (bf),"%s:%s" , event->system, event->name); - evsel->name =strdup (bf); -if (evsel->name ==NULL ) -return -1 ; +if (!evsel->name) { +snprintf (bf,sizeof (bf),"%s:%s" , event->system, event->name); + evsel->name =strdup (bf); +if (evsel->name ==NULL ) +return -1 ; + } evsel->tp_format = event;return 0 ; } -static int perf_evlist__set_tracepoint_names (struct perf_evlist *evlist, -struct pevent *pevent) +static int perf_evlist__prepare_tracepoint_events (struct perf_evlist *evlist, +struct pevent *pevent) {struct perf_evsel *pos;list_for_each_entry (pos, &evlist->entries, node) { -if (pos->attr.type ==PERF_TYPE_TRACEPOINT && !pos->name && -perf_evsel__set_tracepoint_name (pos, pevent)) +if (pos->attr.type ==PERF_TYPE_TRACEPOINT && +perf_evsel__prepare_tracepoint_event (pos, pevent))return -1 ; }
@@ -2409,7 +2415,8 @@ int perf_session__read_header(struct perf_session *session, int fd)lseek (fd, header->data_offset,SEEK_SET ); -if (perf_evlist__set_tracepoint_names (session->evlist, session->pevent)) +if (perf_evlist__prepare_tracepoint_events (session->evlist, + session->pevent)) goto out_delete_evlist; header->frozen =1 ;
@@ -2643,7 +2650,8 @@ int perf_event__process_tracing_data(union perf_event *event,if (size_read + padding != size)die ("tracing data size mismatch" ); -perf_evlist__set_tracepoint_names (session->evlist, session->pevent); +perf_evlist__prepare_tracepoint_events (session->evlist, + session->pevent);return size_read + padding; }
Commit-ID: ae42c6bb9300cf25990bd15f1bd6ee38598f7483 Gitweb: http://git.kernel.org/tip/ae42c6bb9300cf25990bd15f1bd6ee38598f7483 Author: Namhyung Kim <[email protected]> AuthorDate: Thu, 6 Sep 2012 11:10:45 +0900 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Thu, 6 Sep 2012 10:49:03 -0300
perf header: Fix a typo on evsel
For checking return value of the strdup, 'event' should be 'evsel'.
--- tools/perf/util/header.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
tools/perf/util/header.c +1 -1
@@ -2307,7 +2307,7 @@ static int perf_evsel__set_tracepoint_name(struct perf_evsel *evsel,snprintf (bf,sizeof (bf),"%s:%s" , event->system, event->name); evsel->name =strdup (bf); -if (event->name ==NULL ) +if (evsel->name ==NULL )return -1 ; evsel->tp_format = event;