From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932789AbbLHEcO (ORCPT ); Mon, 7 Dec 2015 23:32:14 -0500 Received: from terminus.zytor.com ([198.137.202.10]:50699 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932597AbbLHEcN (ORCPT ); Mon, 7 Dec 2015 23:32:13 -0500 Date: Mon, 7 Dec 2015 20:31:43 -0800 From: tip-bot for Jiri Olsa Message-ID: Cc: namhyung@kernel.org, dsahern@gmail.com, adrian.hunter@intel.com, linux-kernel@vger.kernel.org, acme@redhat.com, mingo@kernel.org, jolsa@kernel.org, a.p.zijlstra@chello.nl, wangnan0@huawei.com, hpa@zytor.com, tglx@linutronix.de, masami.hiramatsu.pt@hitachi.com Reply-To: masami.hiramatsu.pt@hitachi.com, tglx@linutronix.de, hpa@zytor.com, a.p.zijlstra@chello.nl, wangnan0@huawei.com, acme@redhat.com, mingo@kernel.org, jolsa@kernel.org, linux-kernel@vger.kernel.org, adrian.hunter@intel.com, dsahern@gmail.com, namhyung@kernel.org In-Reply-To: <1449131658-1841-4-git-send-email-jolsa@kernel.org> References: <1449131658-1841-4-git-send-email-jolsa@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf test: Use machine__new_host in mmap thread code reading test Git-Commit-ID: 0fd4008ed755c52d85117302a3c2c108b2958420 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: 0fd4008ed755c52d85117302a3c2c108b2958420 Gitweb: http://git.kernel.org/tip/0fd4008ed755c52d85117302a3c2c108b2958420 Author: Jiri Olsa AuthorDate: Thu, 3 Dec 2015 09:34:14 +0100 Committer: Arnaldo Carvalho de Melo CommitDate: Mon, 7 Dec 2015 18:12:55 -0300 perf test: Use machine__new_host in mmap thread code reading test This is more straightforward than what we have now. It also fixes a segfault within machine__exit, that's caused by not creating kernel maps for machine.. We're calling machine__destroy_kernel_maps in machine__exit since commit: ebe9729c8c31 perf machine: Fix to destroy kernel maps when machine exits Signed-off-by: Jiri Olsa Acked-by: Namhyung Kim Cc: Adrian Hunter Cc: David Ahern Cc: Masami Hiramatsu Cc: Peter Zijlstra Cc: Wang Nan Link: http://lkml.kernel.org/r/1449131658-1841-4-git-send-email-jolsa@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/tests/code-reading.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/tools/perf/tests/code-reading.c b/tools/perf/tests/code-reading.c index 4417b6a..26182ff 100644 --- a/tools/perf/tests/code-reading.c +++ b/tools/perf/tests/code-reading.c @@ -433,7 +433,6 @@ enum { static int do_test_code_reading(bool try_kcore) { - struct machines machines; struct machine *machine; struct thread *thread; struct record_opts opts = { @@ -459,8 +458,7 @@ static int do_test_code_reading(bool try_kcore) pid = getpid(); - machines__init(&machines); - machine = &machines.host; + machine = machine__new_host(); ret = machine__create_kernel_maps(machine); if (ret < 0) { @@ -594,9 +592,8 @@ out_err: cpu_map__put(cpus); thread_map__put(threads); } - machines__destroy_kernel_maps(&machines); machine__delete_threads(machine); - machines__exit(&machines); + machine__delete(machine); return err; }