From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933720AbbCDQUb (ORCPT ); Wed, 4 Mar 2015 11:20:31 -0500 Received: from mx1.redhat.com ([209.132.183.28]:52690 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932452AbbCDQU0 (ORCPT ); Wed, 4 Mar 2015 11:20:26 -0500 Date: Wed, 4 Mar 2015 17:19:54 +0100 From: Jiri Olsa To: Namhyung Kim Cc: Arnaldo Carvalho de Melo , Ingo Molnar , Peter Zijlstra , LKML , Frederic Weisbecker , Adrian Hunter , Stephane Eranian , Andi Kleen , David Ahern Subject: Re: [PATCH 07/38] perf tools: Handle indexed data file properly Message-ID: <20150304161954.GA24380@krava.brq.redhat.com> References: <1425352070-1115-1-git-send-email-namhyung@kernel.org> <1425352070-1115-8-git-send-email-namhyung@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1425352070-1115-8-git-send-email-namhyung@kernel.org> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Mar 03, 2015 at 12:07:19PM +0900, Namhyung Kim wrote: > When perf detects data file has index table, process header part first > and then rest data files in a row. Note that the indexed sample data is > recorded for each cpu/thread separately, it's already ordered with > respect to themselves so no need to use the ordered event queue > interface. > > Signed-off-by: Namhyung Kim > --- > tools/perf/util/session.c | 62 ++++++++++++++++++++++++++++++++++++++--------- > tools/perf/util/session.h | 5 ++++ > 2 files changed, 55 insertions(+), 12 deletions(-) > > diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c > index e4f166981ff0..00cd1ad427be 100644 > --- a/tools/perf/util/session.c > +++ b/tools/perf/util/session.c > @@ -1300,11 +1300,10 @@ fetch_mmaped_event(struct perf_session *session, > #define NUM_MMAPS 128 > #endif > > -static int __perf_session__process_events(struct perf_session *session, > +static int __perf_session__process_events(struct perf_session *session, int fd, > u64 data_offset, u64 data_size, > u64 file_size, struct perf_tool *tool) > { > - int fd = perf_data_file__fd(session->file); why is 'fd' passed separatelly here? we have single file now and the only 'file::fd' we use is in session, no? I might be missing some change in later patches ;-) jirka