This is more straightforward than what we have now.

It also fixes segfault within machine__exit, that's caused
but 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

Link: http://lkml.kernel.org/n/tip-nztnkpyc65keceyenixkb...@git.kernel.org
Signed-off-by: Jiri Olsa <jo...@kernel.org>
---
 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 4417b6a079f0..26182ffcea75 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;
 }
-- 
2.4.3

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to