Commit 631e8f0a authored Jan 10, 2018 by Mathieu Poirier Committed by Arnaldo Carvalho de Melo Jan 23, 2018

perf report: Fix regression when decoding intel_pt traces



Commit (93d10af2 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: 93d10af2 ("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>

parent 4c0d8d27

tools/perf/util/session.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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);

Admin message