From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 795E6C43387 for ; Thu, 10 Jan 2019 10:13:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 455272173B for ; Thu, 10 Jan 2019 10:13:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1547115205; bh=OzU/lDRU8qQ0NVpEKxItZbwxDKHQvGlE4aZB4rSPmqo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=glEXUpOLRzMNkPhF5H2wNb+RtO5NZgO4/w2z0Hzmnejy3yntJdL+DHJJvhECbxEpm KKOywiMtVIgPsP/6Z/WugiMvKXltHOciGxn0xZ6Ie4OBVzT6wYOTcqHLEJbu1NgFBp Xq+WsVOH4yFZAsbEvf+FyakjYnKF0wpwIVazj5ug= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728250AbfAJKNN (ORCPT ); Thu, 10 Jan 2019 05:13:13 -0500 Received: from mx1.redhat.com ([209.132.183.28]:50584 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726951AbfAJKNJ (ORCPT ); Thu, 10 Jan 2019 05:13:09 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1FC295D605; Thu, 10 Jan 2019 10:13:09 +0000 (UTC) Received: from krava.brq.redhat.com (unknown [10.43.17.222]) by smtp.corp.redhat.com (Postfix) with ESMTP id 991F026380; Thu, 10 Jan 2019 10:13:07 +0000 (UTC) From: Jiri Olsa To: Arnaldo Carvalho de Melo Cc: lkml , Ingo Molnar , Namhyung Kim , Alexander Shishkin , Peter Zijlstra Subject: [PATCH 3/6] perf session: Add reader object Date: Thu, 10 Jan 2019 11:12:58 +0100 Message-Id: <20190110101301.6196-4-jolsa@kernel.org> In-Reply-To: <20190110101301.6196-1-jolsa@kernel.org> References: <20190110101301.6196-1-jolsa@kernel.org> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Thu, 10 Jan 2019 10:13:09 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Adding session private reader object to encapsulate reading of the event data block. Starting with fd field inside. Link: http://lkml.kernel.org/n/tip-glbs0xvtdcstckscvahueigf@git.kernel.org Signed-off-by: Jiri Olsa --- tools/perf/util/session.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c index c8c2069fb01e..06379cc87f59 100644 --- a/tools/perf/util/session.c +++ b/tools/perf/util/session.c @@ -1820,11 +1820,17 @@ fetch_mmaped_event(struct perf_session *session, #define NUM_MMAPS 128 #endif +struct reader { + int fd; +}; + static int __perf_session__process_events(struct perf_session *session) { + struct reader rd = { + .fd = perf_data__fd(session->data), + }; struct ordered_events *oe = &session->ordered_events; struct perf_tool *tool = session->tool; - int fd = perf_data__fd(session->data); u64 data_offset = session->header.data_offset; u64 data_size = session->header.data_size; u64 head, page_offset, file_offset, file_pos, size; @@ -1864,7 +1870,7 @@ static int __perf_session__process_events(struct perf_session *session) mmap_flags = MAP_PRIVATE; } remap: - buf = mmap(NULL, mmap_size, mmap_prot, mmap_flags, fd, + buf = mmap(NULL, mmap_size, mmap_prot, mmap_flags, rd.fd, file_offset); if (buf == MAP_FAILED) { pr_err("failed to mmap file\n"); -- 2.17.2