| Message ID | 1513273620-3351-1-git-send-email-mathieu.poirier@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [v2] perf report: Fix regression when decoding intelPT traces | expand |
On Thu, Dec 14, 2017 at 10:47:00AM -0700, Mathieu Poirier wrote: > 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> > --- > Change for v2: > - Better handling of error conditions as suggested by Jiri. > - Slight modification of the changelog to reflect the above. > --- > 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 54e30f1bcbd7..eb59dc7c7314 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); > -- > 2.7.4 > Acked-by: Jiri Olsa <jolsa@kernel.org> thanks, jirka
diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c index 54e30f1bcbd7..eb59dc7c7314 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);
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> --- Change for v2: - Better handling of error conditions as suggested by Jiri. - Slight modification of the changelog to reflect the above. --- tools/perf/util/session.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.7.4