perf tools: Handle PERF_RECORD_HEADER_EVENT_TYPE properly
PATCH 1/1 perf tools: Handle PERF_RECORD_HEADER_EVENT_TYPE properly
We removed event types from data file in following commits:
6065210 perf tools: Remove event types framework completely 44b3c57 perf tools: Remove event types from perf data file
We no longer need this information, because we can get it directly from tracepoints.
But we still need to handle PERF_RECORD_HEADER_EVENT_TYPE event for the sake of old perf data files created in pipe mode like:
$ perf.3.4 record -o - foo >perf.data $ perf.312 report -i - < perf.data
--- tools/perf/util/session.c | 6 ++++++ 1 file changed, 6 insertions(+)
tools/perf/util/session.c +6 -0
@@ -1008,6 +1008,12 @@ static int perf_session__process_user_event(struct perf_session *session, unionif (err ==0 )perf_session__set_id_hdr_size (session);return err; +case PERF_RECORD_HEADER_EVENT_TYPE : +/* +* Depreceated, but we need to handle it for sake +* of old data files create in pipe mode. +*/ +return 0 ;case PERF_RECORD_HEADER_TRACING_DATA :/* setup for reading amidst mmap */ lseek (fd, file_offset,SEEK_SET );
Signature · 1 line
1.8.3.1
Quoted 33 lines · Jiri Olsa
We removed event types from data file in following commits:
6065210 perf tools: Remove event types framework completely 44b3c57 perf tools: Remove event types from perf data fileWe no longer need this information, because we can get it directly from tracepoints.
But we still need to handle
PERF_RECORD_HEADER_EVENT_TYPEevent for the sake of old perf data files created in pipe mode like:$ perf.3.4 record -o - foo >perf.data $ perf.312 report -i - < perf.dataReported-by Stephane Eranian <[email protected]>Signed-off-by Jiri Olsa <[email protected]>Cc Corey Ashford <[email protected]>Cc Frederic Weisbecker <[email protected]>Cc Ingo Molnar <[email protected]>Cc Namhyung Kim <[email protected]>Cc Paul Mackerras <[email protected]>Cc Peter Zijlstra <[email protected]>Cc Arnaldo Carvalho de Melo <[email protected]>Cc David Ahern <[email protected]>--- tools/perf/util/session.c | 6 ++++++ 1 file changed, 6 insertions(+)tools/perf/util/session.c +0
-0
tools/perf/util/session.c static int perf_session__process_user_event(struct perf_session *session, union · line 1015
Quoted 8 lines
tools/perf/util/session.c +5
-0@@ -1008,6 +1008,12 @@ static int perf_session__process_user_event(struct perf_session *session, unionif (err ==0 )perf_session__set_id_hdr_size (session);return err; +case PERF_RECORD_HEADER_EVENT_TYPE : +/* +* Depreceated, but we need to handle it for sake +* of old data files create in pipe mode. +*/
Two small speling nits:
s/Depreceated
/Deprecated
s/create
/created
Ack otherwise.
Thanks,
Ingo
Quoted 50 lines · Ingo Molnar
Quoted 33 lines · Jiri Olsa
We removed event types from data file in following commits:
6065210 perf tools: Remove event types framework completely 44b3c57 perf tools: Remove event types from perf data fileWe no longer need this information, because we can get it directly from tracepoints.
But we still need to handle
PERF_RECORD_HEADER_EVENT_TYPEevent for the sake of old perf data files created in pipe mode like:$ perf.3.4 record -o - foo >perf.data $ perf.312 report -i - < perf.dataReported-by Stephane Eranian <[email protected]>Signed-off-by Jiri Olsa <[email protected]>Cc Corey Ashford <[email protected]>Cc Frederic Weisbecker <[email protected]>Cc Ingo Molnar <[email protected]>Cc Namhyung Kim <[email protected]>Cc Paul Mackerras <[email protected]>Cc Peter Zijlstra <[email protected]>Cc Arnaldo Carvalho de Melo <[email protected]>Cc David Ahern <[email protected]>--- tools/perf/util/session.c | 6 ++++++ 1 file changed, 6 insertions(+)tools/perf/util/session.c +0
-0tools/perf/util/session.c static int perf_session__process_user_event(struct perf_session *session, union · line 1015
Quoted 8 lines
tools/perf/util/session.c +5
-0@@ -1008,6 +1008,12 @@ static int perf_session__process_user_event(struct perf_session *session, unionif (err ==0 )perf_session__set_id_hdr_size (session);return err; +case PERF_RECORD_HEADER_EVENT_TYPE : +/* +* Depreceated, but we need to handle it for sake +* of old data files create in pipe mode. +*/ Two small speling nits:
s/Depreceated
/Deprecated
Quoted 8 lines
s/create
/createdAck otherwise.
Thanks,
Ingo
ugh, my spell checker sux.. ;-\ acme, beer for each correction? ;-)
thanks,
jirka
Em Wed, Feb 05, 2014 at 10:03:39AM +0100, Jiri Olsa escreveu:
Quoted 54 lines · Ingo Molnar
Quoted 53 lines · Jiri Olsa
Quoted 34 lines
We removed event types from data file in following commits:
6065210 perf tools: Remove event types framework completely 44b3c57 perf tools: Remove event types from perf data fileWe no longer need this information, because we can get it directly from tracepoints.
But we still need to handle
PERF_RECORD_HEADER_EVENT_TYPEevent for the sake of old perf data files created in pipe mode like:$ perf.3.4 record -o - foo >perf.data $ perf.312 report -i - < perf.dataReported-by Stephane Eranian <[email protected]>Signed-off-by Jiri Olsa <[email protected]>Cc Corey Ashford <[email protected]>Cc Frederic Weisbecker <[email protected]>Cc Ingo Molnar <[email protected]>Cc Namhyung Kim <[email protected]>Cc Paul Mackerras <[email protected]>Cc Peter Zijlstra <[email protected]>Cc Arnaldo Carvalho de Melo <[email protected]>Cc David Ahern <[email protected]>--- tools/perf/util/session.c | 6 ++++++ 1 file changed, 6 insertions(+)tools/perf/util/session.c +0
-0tools/perf/util/session.c static int perf_session__process_user_event(struct perf_session *session, union · line 1015
Quoted 8 lines
tools/perf/util/session.c +5
-0@@ -1008,6 +1008,12 @@ static int perf_session__process_user_event(struct perf_session *session, unionif (err ==0 )perf_session__set_id_hdr_size (session);return err; +case PERF_RECORD_HEADER_EVENT_TYPE : +/* +* Depreceated, but we need to handle it for sake +* of old data files create in pipe mode. +*/ Two small speling nits:
s/Depreceated
/Deprecateds/create
/created
Quoted 7 lines
Quoted 5 lines
Ack otherwise.
Thanks,
Ingo
ugh, my spell checker sux.. ;-\ acme, beer for each correction? ;-)
two for each, deal.
- Arnaldo
tip-bot for Jiri Olsa
merge botperf tools: Handle PERF_RECORD_HEADER_EVENT_TYPE properly
Commit-ID: f67697bd079f4bbcbe7d6d26765a06b18afe0630 Gitweb: http://git.kernel.org/tip/f67697bd079f4bbcbe7d6d26765a06b18afe0630 Author: Jiri Olsa <[email protected]> AuthorDate: Tue, 4 Feb 2014 15:37:48 +0100 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Mon, 10 Feb 2014 11:34:31 -0300
perf tools: Handle PERF_RECORD_HEADER_EVENT_TYPE properly
We removed event types from data file in following commits:
6065210 perf tools: Remove event types framework completely 44b3c57 perf tools: Remove event types from perf data file
We no longer need this information, because we can get it directly from tracepoints.
But we still need to handle PERF_RECORD_HEADER_EVENT_TYPE event for the sake of old perf data files created in pipe mode like:
$ perf.3.4 record -o - foo >perf.data $ perf.312 report -i - < perf.data
--- tools/perf/util/session.c | 6 ++++++ 1 file changed, 6 insertions(+)
tools/perf/util/session.c +6 -0
@@ -1008,6 +1008,12 @@ static int perf_session__process_user_event(struct perf_session *session, unionif (err ==0 )perf_session__set_id_hdr_size (session);return err; +case PERF_RECORD_HEADER_EVENT_TYPE : +/* +* Depreceated, but we need to handle it for sake +* of old data files create in pipe mode. +*/ +return 0 ;case PERF_RECORD_HEADER_TRACING_DATA :/* setup for reading amidst mmap */ lseek (fd, file_offset,SEEK_SET );