perf evlist: Fix missing thread_map__put in propagate_maps()
authorAdrian Hunter <adrian.hunter@intel.com>
Tue, 8 Sep 2015 07:58:54 +0000 (10:58 +0300)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Tue, 15 Sep 2015 13:24:30 +0000 (10:24 -0300)
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@intel.com>
Acked-by: Jiri Olsa <jolsa@kernel.org>
Cc: Kan Liang <kan.liang@intel.com>
Link: http://lkml.kernel.org/r/1441699142-18905-7-git-send-email-adrian.hunter@intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
tools/perf/util/evlist.c

index 961560b2046b4999749b34f934fbcb6ba9e835e0..79056c6ae507245ba14122a9cdcdd20eafc2aebf 100644 (file)
@@ -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);
        }
 }