Commit-ID: f785657b0fbe69fb3f5dfb0a7567cdb0777e57d1
Gitweb: https://git.kernel.org/tip/f785657b0fbe69fb3f5dfb0a7567cdb0777e57d1
Author: Mathieu Poirier <mathieu.poirier@xxxxxxxxxx>
AuthorDate: Thu, 14 Dec 2017 10:47:00 -0700
Committer: Ingo Molnar <mingo@xxxxxxxxxx>
CommitDate: Mon, 18 Dec 2017 06:26:20 +0100
perf report: Fix regression when decoding Intel-PT traces
Commit:
93d10af26bb7 ("perf tools: Optimize sample parsing for ordered events")
... breaks Intel-PT trace decoding by invariably returning an error if
the event type isn't a PERF_SAMPLE_TIME.
With this patch the timestamp is initialised and processing is allowed to
continue if the error returned by function
perf_evlist__parse_sample_timestamp() is not a fault.
Signed-off-by: Mathieu Poirier <mathieu.poirier@xxxxxxxxxx>
Acked-by: Jiri Olsa <jolsa@xxxxxxxxxx>
Cc: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: acme@xxxxxxxxxx
Cc: alexander.shishkin@xxxxxxxxxxxxxxx
Cc: jolsa@xxxxxxxxxx
Link: http://lkml.kernel.org/r/1513273620-3351-1-git-send-email-mathieu.poirier@xxxxxxxxxx
Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx>
---
tools/perf/util/session.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
index 54e30f1..eb59dc7 100644
--- a/tools/perf/util/session.c
+++ b/tools/perf/util/session.c
@@ -1508,10 +1508,10 @@ static s64 perf_session__process_event(struct perf_session *session,
return perf_session__process_user_event(session, event, file_offset);
if (tool->ordered_events) {
- u64 timestamp;
+ u64 timestamp = -1ULL;
ret = perf_evlist__parse_sample_timestamp(evlist, event, ×tamp);
- if (ret)
+ if (ret != -1)
return ret;
ret = perf_session__queue_event(session, event, timestamp, file_offset);
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|