Commit 0fd4008e authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo

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:

  ebe9729c perf machine: Fix to destroy kernel maps when machine exits
Signed-off-by: default avatarJiri Olsa <jolsa@kernel.org>
Acked-by: default avatarNamhyung 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.orgSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 04684793
...@@ -433,7 +433,6 @@ enum { ...@@ -433,7 +433,6 @@ enum {
static int do_test_code_reading(bool try_kcore) static int do_test_code_reading(bool try_kcore)
{ {
struct machines machines;
struct machine *machine; struct machine *machine;
struct thread *thread; struct thread *thread;
struct record_opts opts = { struct record_opts opts = {
...@@ -459,8 +458,7 @@ static int do_test_code_reading(bool try_kcore) ...@@ -459,8 +458,7 @@ static int do_test_code_reading(bool try_kcore)
pid = getpid(); pid = getpid();
machines__init(&machines); machine = machine__new_host();
machine = &machines.host;
ret = machine__create_kernel_maps(machine); ret = machine__create_kernel_maps(machine);
if (ret < 0) { if (ret < 0) {
...@@ -594,9 +592,8 @@ static int do_test_code_reading(bool try_kcore) ...@@ -594,9 +592,8 @@ static int do_test_code_reading(bool try_kcore)
cpu_map__put(cpus); cpu_map__put(cpus);
thread_map__put(threads); thread_map__put(threads);
} }
machines__destroy_kernel_maps(&machines);
machine__delete_threads(machine); machine__delete_threads(machine);
machines__exit(&machines); machine__delete(machine);
return err; return err;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment