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

perf test: Use machine__new_host in mmap thread lookup 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>
Tested-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
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-3-git-send-email-jolsa@kernel.orgSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent bdaba8ae
...@@ -149,7 +149,6 @@ static int synth_process(struct machine *machine) ...@@ -149,7 +149,6 @@ static int synth_process(struct machine *machine)
static int mmap_events(synth_cb synth) static int mmap_events(synth_cb synth)
{ {
struct machines machines;
struct machine *machine; struct machine *machine;
int err, i; int err, i;
...@@ -162,8 +161,7 @@ static int mmap_events(synth_cb synth) ...@@ -162,8 +161,7 @@ static int mmap_events(synth_cb synth)
*/ */
TEST_ASSERT_VAL("failed to create threads", !threads_create()); TEST_ASSERT_VAL("failed to create threads", !threads_create());
machines__init(&machines); machine = machine__new_host();
machine = &machines.host;
dump_trace = verbose > 1 ? 1 : 0; dump_trace = verbose > 1 ? 1 : 0;
...@@ -203,7 +201,7 @@ static int mmap_events(synth_cb synth) ...@@ -203,7 +201,7 @@ static int mmap_events(synth_cb synth)
} }
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