projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0fd4008
)
perf test: Fix cpus and thread maps reference in error path
author
Jiri Olsa
<
[email protected]
>
Thu, 3 Dec 2015 08:34:15 +0000
(09:34 +0100)
committer
Arnaldo Carvalho de Melo
<
[email protected]
>
Mon, 7 Dec 2015 21:12:55 +0000
(18:12 -0300)
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 <
[email protected]
>
Acked-by: Namhyung Kim <
[email protected]
>
Cc: Adrian Hunter <
[email protected]
>
Cc: David Ahern <
[email protected]
>
Cc: Masami Hiramatsu <
[email protected]
>
Cc: Peter Zijlstra <
[email protected]
>
Cc: Wang Nan <
[email protected]
>
Link:
http://lkml.kernel.org/r/
[email protected]
Signed-off-by: Arnaldo Carvalho de Melo <
[email protected]
>
tools/perf/tests/code-reading.c
patch
|
blob
|
history
diff --git
a/tools/perf/tests/code-reading.c
b/tools/perf/tests/code-reading.c
index 26182ffcea756dcc2312d4da57d2907228ecd019..313a48c6b2bc8e111e113e79c4a72fdc2d720ac5 100644
(file)
--- 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)
if (ret < 0) {
if (!excl_kernel) {
excl_kernel = true;
+ /*
+ * Both cpus and threads are now owned by evlist
+ * and will be freed by following perf_evlist__set_maps
+ * call. Getting refference to keep them alive.
+ */
+ cpu_map__get(cpus);
+ thread_map__get(threads);
perf_evlist__set_maps(evlist, NULL, NULL);
perf_evlist__delete(evlist);
evlist = NULL;