From patchwork Sun Dec 3 02:00:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wang Nan X-Patchwork-Id: 120442 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp2903814qgn; Sat, 2 Dec 2017 18:03:38 -0800 (PST) X-Google-Smtp-Source: AGs4zMY5RjxhzM2McrolGlSaCRkmqFFFC6yZfC9MiVbqT50JX7qudiSxHHdd6fx4hlfTDx5q30/h X-Received: by 10.84.232.74 with SMTP id f10mr10067843pln.90.1512266618041; Sat, 02 Dec 2017 18:03:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512266618; cv=none; d=google.com; s=arc-20160816; b=MnkqN7LfifybMtv3zZZEMrOsmHYlsgbBBg47m8DgxkOGKeY/vFtJ+E+UVDBjjx1hjl 2JzyeUD+2+EkXMHVcWEuqPaJ1aQy4WafRF+ir7z6hKKRFwY0zhN73ApQuALwnd7Ghydo pv4BnoUAwQj1COHDZhStjARU3cx9sTYeUm8A+lYdJIlcO289baXpx/Mhkt1bIIY0YR/h IyQbpWIFTbkoUX98iJgxg/awzFNPMNHTrQ5WZEZ6EkV7csMO5JLtpZQiUVrv+w9KailI dKTek7XdZX0Cnl4TBG+NGi7Qyb1QG029y34Gih5lWYTUbhRPa3JgEhPChXNH6/ISRA5W z3AQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:arc-authentication-results; bh=Gaxphl/Zelq2mFvwjbdMlPzhuOrtQJlvZm/upNaVx6Y=; b=GQbtu0WNzAymt2KA+JpvVRhloPm+tmtRELTleFkjGfyeWDU03zsXXAVknGOwlMiBD9 Hp/WX2iqHwyzrDXqxExrOCy2hRFzfHF8tNXgD6dxXghrpqt1ExyRKCi7VngUKNHbpKGq S2u8RU1aWu1l+CpGr0R/LIM8cX9PxC1zfu3LqP7mm9ttVo5yZZgjHa6NB8hHla/dfjTw 3fI3cfP1x1yEN3thX+McLxdrwcO/58QDufi51af4SmOvgj+b0UWxRyr8jdpq0KjIELhj YggafFajWq6jexKaFH5ioatxS7QyNBfXDhjgpmYhTYM+BZrku4P/DyQx+KhFzRzvNALQ cvaQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 85si7678517pfz.335.2017.12.02.18.03.37; Sat, 02 Dec 2017 18:03:38 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752695AbdLCCDL (ORCPT + 28 others); Sat, 2 Dec 2017 21:03:11 -0500 Received: from szxga05-in.huawei.com ([45.249.212.191]:2244 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751852AbdLCCCy (ORCPT ); Sat, 2 Dec 2017 21:02:54 -0500 Received: from DGGEMS408-HUB.china.huawei.com (unknown [172.30.72.58]) by Forcepoint Email with ESMTP id 7873599ED335E; Sun, 3 Dec 2017 10:02:46 +0800 (CST) Received: from linux-4hy3.site (10.107.193.248) by DGGEMS408-HUB.china.huawei.com (10.3.19.208) with Microsoft SMTP Server id 14.3.361.1; Sun, 3 Dec 2017 10:02:41 +0800 From: Wang Nan To: , , , , CC: Wang Nan Subject: [PATCH v2 2/8] perf tools: Remove 'overwrite' parameter from perf_evlist__mmap_ex Date: Sun, 3 Dec 2017 02:00:38 +0000 Message-ID: <20171203020044.81680-3-wangnan0@huawei.com> X-Mailer: git-send-email 2.10.1 In-Reply-To: <20171203020044.81680-1-wangnan0@huawei.com> References: <20171203020044.81680-1-wangnan0@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.107.193.248] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org All users of perf_evlist__mmap_ex set !overwrite. Remove it from its arguments list. Signed-off-by: Wang Nan --- tools/perf/builtin-record.c | 2 +- tools/perf/util/evlist.c | 8 ++++---- tools/perf/util/evlist.h | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) -- 2.10.1 diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c index e304bc4..08070f8 100644 --- a/tools/perf/builtin-record.c +++ b/tools/perf/builtin-record.c @@ -301,7 +301,7 @@ static int record__mmap_evlist(struct record *rec, struct record_opts *opts = &rec->opts; char msg[512]; - if (perf_evlist__mmap_ex(evlist, opts->mmap_pages, false, + if (perf_evlist__mmap_ex(evlist, opts->mmap_pages, opts->auxtrace_mmap_pages, opts->auxtrace_snapshot_mode) < 0) { if (errno == EPERM) { diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c index 3c1778b..93272d9 100644 --- a/tools/perf/util/evlist.c +++ b/tools/perf/util/evlist.c @@ -1052,14 +1052,14 @@ int perf_evlist__parse_mmap_pages(const struct option *opt, const char *str, * Return: %0 on success, negative error code otherwise. */ int perf_evlist__mmap_ex(struct perf_evlist *evlist, unsigned int pages, - bool overwrite, unsigned int auxtrace_pages, + unsigned int auxtrace_pages, bool auxtrace_overwrite) { struct perf_evsel *evsel; const struct cpu_map *cpus = evlist->cpus; const struct thread_map *threads = evlist->threads; struct mmap_params mp = { - .prot = PROT_READ | (overwrite ? 0 : PROT_WRITE), + .prot = PROT_READ | PROT_WRITE, }; if (!evlist->mmap) @@ -1070,7 +1070,7 @@ int perf_evlist__mmap_ex(struct perf_evlist *evlist, unsigned int pages, if (evlist->pollfd.entries == NULL && perf_evlist__alloc_pollfd(evlist) < 0) return -ENOMEM; - evlist->overwrite = overwrite; + evlist->overwrite = false; evlist->mmap_len = perf_evlist__mmap_size(pages); pr_debug("mmap size %zuB\n", evlist->mmap_len); mp.mask = evlist->mmap_len - page_size - 1; @@ -1093,7 +1093,7 @@ int perf_evlist__mmap_ex(struct perf_evlist *evlist, unsigned int pages, int perf_evlist__mmap(struct perf_evlist *evlist, unsigned int pages) { - return perf_evlist__mmap_ex(evlist, pages, false, 0, false); + return perf_evlist__mmap_ex(evlist, pages, 0, false); } int perf_evlist__create_maps(struct perf_evlist *evlist, struct target *target) diff --git a/tools/perf/util/evlist.h b/tools/perf/util/evlist.h index f0f2c8b..424a3d6 100644 --- a/tools/perf/util/evlist.h +++ b/tools/perf/util/evlist.h @@ -169,7 +169,7 @@ int perf_evlist__parse_mmap_pages(const struct option *opt, unsigned long perf_event_mlock_kb_in_pages(void); int perf_evlist__mmap_ex(struct perf_evlist *evlist, unsigned int pages, - bool overwrite, unsigned int auxtrace_pages, + unsigned int auxtrace_pages, bool auxtrace_overwrite); int perf_evlist__mmap(struct perf_evlist *evlist, unsigned int pages); void perf_evlist__munmap(struct perf_evlist *evlist);