summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathieu Poirier <mathieu.poirier@linaro.org>2018-01-10 13:31:52 -0700
committerArnaldo Carvalho de Melo <acme@redhat.com>2018-01-23 09:51:36 -0300
commit631e8f0a9748d7ef1eb6a84d0d5b9e81a79433ef (patch)
tree7a4b4d5cc072d4a3746a22111f254f31e706cb86
parent4c0d8d27954d9efb2a02ec9fc16f39b02f248bb7 (diff)
perf report: Fix regression when decoding intel_pt traces
Commit (93d10af26bb7 perf tools: Optimize sample parsing for ordered events) breaks intelPT 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@linaro.org> Acked-by: Adrian Hunter <adrian.hunter@intel.com> Acked-by: Jiri Olsa <jolsa@redhat.com> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Peter Zijlstra <peterz@infradead.org> Fixes: 93d10af26bb7 ("perf tools: Optimize sample parsing for ordered events") Link: http://lkml.kernel.org/r/1515616312-27645-1-git-send-email-mathieu.poirier@linaro.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
-rw-r--r--tools/perf/util/session.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
index 8d0fa2f8da16..c71ced7db152 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, &timestamp);
- if (ret)
+ if (ret && ret != -1)
return ret;
ret = perf_session__queue_event(session, event, timestamp, file_offset);