Adding path to reader object, so we can display file the processing fails for (string in [] brackets).
$ perf report --stdio 0x5e0 [perf.data/data.3] [0xa200]: failed to process type: -1577027574 Link: http://lkml.kernel.org/n/tip-4bjnoy4sln7adqtd3505q...@git.kernel.org Signed-off-by: Jiri Olsa <jo...@kernel.org> --- tools/perf/util/session.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c index b55f4281b1da..33f363caaa7c 100644 --- a/tools/perf/util/session.c +++ b/tools/perf/util/session.c @@ -1858,6 +1858,7 @@ struct reader { u64 data_size; u64 data_offset; reader_cb_t process; + char *path; }; static int @@ -1872,6 +1873,8 @@ reader__process_events(struct reader *rd, struct perf_session *session, union perf_event *event; s64 skip; + pr_debug("reader processing %s\n", rd->path); + page_offset = page_size * (rd->data_offset / page_size); file_offset = page_offset; head = rd->data_offset - page_offset; @@ -1927,8 +1930,8 @@ reader__process_events(struct reader *rd, struct perf_session *session, if (size < sizeof(struct perf_event_header) || (skip = rd->process(session, event, file_pos)) < 0) { - pr_err("%#" PRIx64 " [%#x]: failed to process type: %d\n", - file_offset + head, event->header.size, + pr_err("%#" PRIx64 " [%s] [%#x]: failed to process type: %d\n", + file_offset + head, rd->path, event->header.size, event->header.type); err = -EINVAL; goto out; @@ -1966,6 +1969,7 @@ static int __perf_session__process_events(struct perf_session *session) .data_size = session->header.data_size, .data_offset = session->header.data_offset, .process = process_simple, + .path = session->data->file.path, }; struct ordered_events *oe = &session->ordered_events; struct perf_tool *tool = session->tool; @@ -2040,6 +2044,7 @@ static int __perf_session__process_dir_events(struct perf_session *session) .data_size = session->header.data_size, .data_offset = session->header.data_offset, .process = process_simple, + .path = session->data->file.path, }; int i, ret = 0; struct ui_progress prog; @@ -2066,6 +2071,7 @@ static int __perf_session__process_dir_events(struct perf_session *session) .data_size = file->size, .data_offset = 0, .process = process_index, + .path = file->path, }; ret = reader__process_events(&rd, session, &prog); -- 2.17.2
