perf session: Add ability to 'skip' a non-piped event stream
A piped event stream may contain arbitary sized tracepoint information following a PERF_RECORD_HEADER_TRACING_DATA event. The position in the stream has to be 'skipped' to match the start of the next event. Provide the same ability to a non-piped event stream to allow for Instruction Trace data that may also be in a non-piped event stream. Signed-off-by: Adrian Hunter <adrian.hunter@intel.com> Cc: David Ahern <dsahern@gmail.com> Cc: Frederic Weisbecker <fweisbec@gmail.com> Cc: Jiri Olsa <jolsa@redhat.com> Cc: Namhyung Kim <namhyung@gmail.com> Cc: Paul Mackerras <paulus@samba.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Stephane Eranian <eranian@google.com> Link: http://lkml.kernel.org/r/1406143198-20732-1-git-send-email-adrian.hunter@intel.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
committed by
Arnaldo Carvalho de Melo
parent
2a03068c5c
commit
6f917c7099
@@ -1284,6 +1284,7 @@ int __perf_session__process_events(struct perf_session *session,
|
|||||||
union perf_event *event;
|
union perf_event *event;
|
||||||
uint32_t size;
|
uint32_t size;
|
||||||
struct ui_progress prog;
|
struct ui_progress prog;
|
||||||
|
int skip;
|
||||||
|
|
||||||
perf_tool__fill_defaults(tool);
|
perf_tool__fill_defaults(tool);
|
||||||
|
|
||||||
@@ -1344,7 +1345,8 @@ more:
|
|||||||
size = event->header.size;
|
size = event->header.size;
|
||||||
|
|
||||||
if (size < sizeof(struct perf_event_header) ||
|
if (size < sizeof(struct perf_event_header) ||
|
||||||
perf_session__process_event(session, event, tool, file_pos) < 0) {
|
(skip = perf_session__process_event(session, event, tool, file_pos))
|
||||||
|
< 0) {
|
||||||
pr_err("%#" PRIx64 " [%#x]: failed to process type: %d\n",
|
pr_err("%#" PRIx64 " [%#x]: failed to process type: %d\n",
|
||||||
file_offset + head, event->header.size,
|
file_offset + head, event->header.size,
|
||||||
event->header.type);
|
event->header.type);
|
||||||
@@ -1352,6 +1354,9 @@ more:
|
|||||||
goto out_err;
|
goto out_err;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (skip)
|
||||||
|
size += skip;
|
||||||
|
|
||||||
head += size;
|
head += size;
|
||||||
file_pos += size;
|
file_pos += size;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user