From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754465AbdLNRrG (ORCPT ); Thu, 14 Dec 2017 12:47:06 -0500 Received: from mail-it0-f66.google.com ([209.85.214.66]:41298 "EHLO mail-it0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753950AbdLNRrD (ORCPT ); Thu, 14 Dec 2017 12:47:03 -0500 X-Google-Smtp-Source: ACJfBouZ1COBBFwh6D+7fkePa6ivp9+2h318PbeDvlHBIQfxovTRido8dr0mMI83vVsbBbArFIPfrQ== From: Mathieu Poirier To: jolsa@redhat.com Cc: peterz@infradead.org, mingo@redhat.com, acme@kernel.org, alexander.shishkin@linux.intel.com, linux-kernel@vger.kernel.org, mathieu.poirier@linaro.org Subject: [PATCH v2] perf report: Fix regression when decoding intelPT traces Date: Thu, 14 Dec 2017 10:47:00 -0700 Message-Id: <1513273620-3351-1-git-send-email-mathieu.poirier@linaro.org> X-Mailer: git-send-email 2.7.4 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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