[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-631e8f0a9748d7ef1eb6a84d0d5b9e81a79433ef@git.kernel.org>
Date: Wed, 24 Jan 2018 03:22:41 -0800
From: tip-bot for Mathieu Poirier <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, mathieu.poirier@...aro.org,
peterz@...radead.org, mingo@...nel.org,
alexander.shishkin@...ux.intel.com, tglx@...utronix.de,
jolsa@...hat.com, hpa@...or.com, acme@...hat.com,
adrian.hunter@...el.com
Subject: [tip:perf/core] perf report: Fix regression when decoding intel_pt
traces
Commit-ID: 631e8f0a9748d7ef1eb6a84d0d5b9e81a79433ef
Gitweb: https://git.kernel.org/tip/631e8f0a9748d7ef1eb6a84d0d5b9e81a79433ef
Author: Mathieu Poirier <mathieu.poirier@...aro.org>
AuthorDate: Wed, 10 Jan 2018 13:31:52 -0700
Committer: Arnaldo Carvalho de Melo <acme@...hat.com>
CommitDate: Tue, 23 Jan 2018 09:51:36 -0300
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@...aro.org>
Acked-by: Adrian Hunter <adrian.hunter@...el.com>
Acked-by: Jiri Olsa <jolsa@...hat.com>
Cc: Alexander Shishkin <alexander.shishkin@...ux.intel.com>
Cc: Peter Zijlstra <peterz@...radead.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@...hat.com>
---
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 8d0fa2f..c71ced7 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 && ret != -1)
return ret;
ret = perf_session__queue_event(session, event, timestamp, file_offset);
Powered by blists - more mailing lists