[tip:perf/core] perf evlist: Fix missing thread_map__put in propagate_maps()

From: tip-bot for Adrian Hunter
Date: Wed Sep 16 2015 - 03:33:00 EST


Commit-ID: b278c364b35ae940b05f6a9edf8061fc886cd09e
Gitweb: http://git.kernel.org/tip/b278c364b35ae940b05f6a9edf8061fc886cd09e
Author: Adrian Hunter <adrian.hunter@xxxxxxxxx>
AuthorDate: Tue, 8 Sep 2015 10:58:54 +0300
Committer: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
CommitDate: Tue, 15 Sep 2015 10:24:30 -0300

perf evlist: Fix missing thread_map__put in propagate_maps()

perf_evlist__propagate_maps() incorrectly assumes evsel->threads is NULL
before reassigning it, but it won't be NULL when perf_evlist__set_maps()
is used to set different (or NULL) maps. Thus thread_map__put must be
used, which works even if evsel->threads is NULL.

Signed-off-by: Adrian Hunter <adrian.hunter@xxxxxxxxx>
Acked-by: Jiri Olsa <jolsa@xxxxxxxxxx>
Cc: Kan Liang <kan.liang@xxxxxxxxx>
Link: http://lkml.kernel.org/r/1441699142-18905-7-git-send-email-adrian.hunter@xxxxxxxxx
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
---
tools/perf/util/evlist.c | 1 +
1 file changed, 1 insertion(+)

diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
index 961560b..79056c6 100644
--- a/tools/perf/util/evlist.c
+++ b/tools/perf/util/evlist.c
@@ -1116,6 +1116,7 @@ static void perf_evlist__propagate_maps(struct perf_evlist *evlist)
evsel->cpus = cpu_map__get(evlist->cpus);
}

+ thread_map__put(evsel->threads);
evsel->threads = thread_map__get(evlist->threads);
}
}
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/