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 <[email protected]>
Acked-by: Adrian Hunter <[email protected]>
Acked-by: Jiri Olsa <[email protected]>
Cc: Alexander Shishkin <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Fixes: 93d10af26bb7 ("perf tools: Optimize sample parsing for ordered events")
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>

diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
index 8d0fa2f8da1690699199a2221bfdd03d23208089..c71ced7db152e6380984d740311ec205679c39eb 100644 (file)
--- 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);