From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752164AbcGPUsS (ORCPT ); Sat, 16 Jul 2016 16:48:18 -0400 Received: from terminus.zytor.com ([198.137.202.10]:38718 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751779AbcGPUsP (ORCPT ); Sat, 16 Jul 2016 16:48:15 -0400 Date: Sat, 16 Jul 2016 13:48:05 -0700 From: tip-bot for Wang Nan Message-ID: Cc: mingo@kernel.org, linux-kernel@vger.kernel.org, hekuang@huawei.com, acme@redhat.com, namhyung@kernel.org, mhiramat@kernel.org, nilayvaish@gmail.com, hpa@zytor.com, wangnan0@huawei.com, lizefan@huawei.com, tglx@linutronix.de, jolsa@kernel.org Reply-To: mingo@kernel.org, acme@redhat.com, hekuang@huawei.com, namhyung@kernel.org, mhiramat@kernel.org, linux-kernel@vger.kernel.org, wangnan0@huawei.com, hpa@zytor.com, jolsa@kernel.org, tglx@linutronix.de, lizefan@huawei.com, nilayvaish@gmail.com In-Reply-To: <1468485287-33422-7-git-send-email-wangnan0@huawei.com> References: <1468485287-33422-7-git-send-email-wangnan0@huawei.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf evlist: Extract common code in mmap failure processing Git-Commit-ID: a1f72618346a4e7ce9cff6aec1a62737d5d08763 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: a1f72618346a4e7ce9cff6aec1a62737d5d08763 Gitweb: http://git.kernel.org/tip/a1f72618346a4e7ce9cff6aec1a62737d5d08763 Author: Wang Nan AuthorDate: Thu, 14 Jul 2016 08:34:38 +0000 Committer: Arnaldo Carvalho de Melo CommitDate: Fri, 15 Jul 2016 17:27:47 -0300 perf evlist: Extract common code in mmap failure processing In perf_evlist__mmap_per_cpu() and perf_evlist__mmap_per_thread(), in case of mmap failure, successfully created maps should be cleared. Current code uses two loops calling __perf_evlist__munmap() for each function. This patch extracts common code to perf_evlist__munmap_nofree() and use previous introduced decoupled API perf_mmap__munmap(). Now __perf_evlist__munmap() can be removed because of no user. Signed-off-by: Wang Nan Acked-by: Jiri Olsa Cc: He Kuang Cc: Masami Hiramatsu Cc: Namhyung Kim Cc: Nilay Vaish Cc: Zefan Li Cc: pi3orama@163.com Link: http://lkml.kernel.org/r/1468485287-33422-7-git-send-email-wangnan0@huawei.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/evlist.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c index 1462085..54ae0a0 100644 --- a/tools/perf/util/evlist.c +++ b/tools/perf/util/evlist.c @@ -28,7 +28,6 @@ #include static void perf_evlist__mmap_put(struct perf_evlist *evlist, int idx); -static void __perf_evlist__munmap(struct perf_evlist *evlist, int idx); static void perf_mmap__munmap(struct perf_mmap *map); static void perf_mmap__put(struct perf_mmap *map); @@ -970,12 +969,7 @@ static void perf_mmap__munmap(struct perf_mmap *map) auxtrace_mmap__munmap(&map->auxtrace_mmap); } -static void __perf_evlist__munmap(struct perf_evlist *evlist, int idx) -{ - perf_mmap__munmap(&evlist->mmap[idx]); -} - -void perf_evlist__munmap(struct perf_evlist *evlist) +static void perf_evlist__munmap_nofree(struct perf_evlist *evlist) { int i; @@ -983,8 +977,12 @@ void perf_evlist__munmap(struct perf_evlist *evlist) return; for (i = 0; i < evlist->nr_mmaps; i++) - __perf_evlist__munmap(evlist, i); + perf_mmap__munmap(&evlist->mmap[i]); +} +void perf_evlist__munmap(struct perf_evlist *evlist) +{ + perf_evlist__munmap_nofree(evlist); zfree(&evlist->mmap); } @@ -1142,8 +1140,7 @@ static int perf_evlist__mmap_per_cpu(struct perf_evlist *evlist, return 0; out_unmap: - for (cpu = 0; cpu < nr_cpus; cpu++) - __perf_evlist__munmap(evlist, cpu); + perf_evlist__munmap_nofree(evlist); return -1; } @@ -1168,8 +1165,7 @@ static int perf_evlist__mmap_per_thread(struct perf_evlist *evlist, return 0; out_unmap: - for (thread = 0; thread < nr_threads; thread++) - __perf_evlist__munmap(evlist, thread); + perf_evlist__munmap_nofree(evlist); return -1; }