diff options
author | Jiri Olsa <jolsa@kernel.org> | 2015-12-03 03:34:15 -0500 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2015-12-07 16:12:55 -0500 |
commit | 7320b1b3d9e6af30adcbead64568be3c40b50e59 (patch) | |
tree | 6e0d854d268d1d9a68aa483f37d409543eb37973 /tools/perf/tests/code-reading.c | |
parent | 0fd4008ed755c52d85117302a3c2c108b2958420 (diff) |
perf test: Fix cpus and thread maps reference in error path
In error path to try user space event, both cpus and threads map now
owned by evlist and freed by perf_evlist__set_maps call. Getting
reference to keep them alive.
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-5-git-send-email-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/tests/code-reading.c')
-rw-r--r-- | tools/perf/tests/code-reading.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/tools/perf/tests/code-reading.c b/tools/perf/tests/code-reading.c index 26182ffcea75..313a48c6b2bc 100644 --- a/tools/perf/tests/code-reading.c +++ b/tools/perf/tests/code-reading.c | |||
@@ -547,6 +547,13 @@ static int do_test_code_reading(bool try_kcore) | |||
547 | if (ret < 0) { | 547 | if (ret < 0) { |
548 | if (!excl_kernel) { | 548 | if (!excl_kernel) { |
549 | excl_kernel = true; | 549 | excl_kernel = true; |
550 | /* | ||
551 | * Both cpus and threads are now owned by evlist | ||
552 | * and will be freed by following perf_evlist__set_maps | ||
553 | * call. Getting refference to keep them alive. | ||
554 | */ | ||
555 | cpu_map__get(cpus); | ||
556 | thread_map__get(threads); | ||
550 | perf_evlist__set_maps(evlist, NULL, NULL); | 557 | perf_evlist__set_maps(evlist, NULL, NULL); |
551 | perf_evlist__delete(evlist); | 558 | perf_evlist__delete(evlist); |
552 | evlist = NULL; | 559 | evlist = NULL; |