Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1286223

[tip:perf/core] perf test: Use machine__new_host in mmap thread code reading test

Show all headers | View raw

Commit-ID:  0fd4008ed755c52d85117302a3c2c108b2958420
Gitweb:     http://git.kernel.org/tip/0fd4008ed755c52d85117302a3c2c108b2958420
Author:     Jiri Olsa <jolsa@kernel.org>
AuthorDate: Thu, 3 Dec 2015 09:34:14 +0100
Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
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 <jolsa@kernel.org>
Acked-by: Namhyung Kim <namhyung@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/r/1449131658-1841-4-git-send-email-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 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;
 }
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 0/7] perf test: Fixes Jiri Olsa <jolsa@kernel.org> - 2015-12-03 09:40 +0100
  [PATCH 7/7] perf test: Create kernel maps properly for hist entries test Jiri Olsa <jolsa@kernel.org> - 2015-12-03 09:40 +0100
    Re: [PATCH 7/7] perf test: Create kernel maps properly for hist  entries test Namhyung Kim <namhyung@kernel.org> - 2015-12-04 14:30 +0100
      [PATCHv2 7/7] perf test: Create kernel maps properly for hist  entries test Jiri Olsa <jolsa@redhat.com> - 2015-12-06 17:10 +0100
  [PATCH 3/7] perf test: Use machine__new_host in mma thread code reading test Jiri Olsa <jolsa@kernel.org> - 2015-12-03 09:40 +0100
    [tip:perf/core] perf test:   Use machine__new_host in mmap thread code reading test tip-bot for Jiri Olsa <tipbot@zytor.com> - 2015-12-08 05:40 +0100
  [PATCH 2/7] perf test: Use machine__new_host in mma thread lookup test Jiri Olsa <jolsa@kernel.org> - 2015-12-03 09:40 +0100
    Re: [PATCH 2/7] perf test: Use machine__new_host in mma thread  lookup test Namhyung Kim <namhyung@kernel.org> - 2015-12-04 14:30 +0100
      Re: [PATCH 2/7] perf test: Use machine__new_host in mma thread  lookup test Jiri Olsa <jolsa@redhat.com> - 2015-12-06 17:10 +0100
    [tip:perf/core] perf test:   Use machine__new_host in mmap thread lookup test tip-bot for Jiri Olsa <tipbot@zytor.com> - 2015-12-08 05:40 +0100
  [PATCH 6/7] perf test: Use machine__new_host in thread mg sharing test Jiri Olsa <jolsa@kernel.org> - 2015-12-03 09:40 +0100
  [PATCH 1/7] perf test: Use machine__new_host in dwarf unwind test Jiri Olsa <jolsa@kernel.org> - 2015-12-03 09:40 +0100
    [tip:perf/core] perf test:   Use machine__new_host in dwarf unwind test tip-bot for Jiri Olsa <tipbot@zytor.com> - 2015-12-08 05:40 +0100
  Re: [PATCH 0/7] perf test: Fixes Jiri Olsa <jolsa@redhat.com> - 2015-12-03 10:20 +0100
  Re: [PATCH 0/7] perf test: Fixes Namhyung Kim <namhyung@kernel.org> - 2015-12-04 14:30 +0100

csiph-web