Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1225797

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

Show all headers | View raw

Commit-ID:  b278c364b35ae940b05f6a9edf8061fc886cd09e
Gitweb:     http://git.kernel.org/tip/b278c364b35ae940b05f6a9edf8061fc886cd09e
Author:     Adrian Hunter <adrian.hunter@intel.com>
AuthorDate: Tue, 8 Sep 2015 10:58:54 +0300
Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
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@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 | 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@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

[PATCH V3 00/14] perf tools: Fix gaps propagating maps Adrian Hunter <adrian.hunter@intel.com> - 2015-09-08 10:10 +0200
  [PATCH V3 13/14] perf tools: Fix task exit test setting maps Adrian Hunter <adrian.hunter@intel.com> - 2015-09-08 10:10 +0200
    [tip:perf/core] perf tests: Fix task exit test setting maps tip-bot for Adrian Hunter <tipbot@zytor.com> - 2015-09-16 09:40 +0200
  [PATCH V3 01/14] perf tools: Simplify perf_evlist__propagate_maps logic Adrian Hunter <adrian.hunter@intel.com> - 2015-09-08 10:10 +0200
    [tip:perf/core] perf evlist: Simplify propagate_maps() logic tip-bot for Adrian Hunter <tipbot@zytor.com> - 2015-09-16 09:40 +0200
  [PATCH V3 12/14] perf tools: Fix perf_evlist__create_syswide_maps() not propagating maps Adrian Hunter <adrian.hunter@intel.com> - 2015-09-08 10:10 +0200
    [tip:perf/core] perf evlist: Fix create_syswide_maps()   not propagating maps tip-bot for Adrian Hunter <tipbot@zytor.com> - 2015-09-16 09:40 +0200
  [PATCH V3 09/14] perf tools: Make perf_evlist__create_maps() use perf_evlist__set_maps() Adrian Hunter <adrian.hunter@intel.com> - 2015-09-08 10:10 +0200
    [tip:perf/core] perf evlist: Make create_maps() use set_maps() tip-bot for Adrian Hunter <tipbot@zytor.com> - 2015-09-16 09:40 +0200
  [PATCH V3 08/14] perf tools: Make perf_evlist__set_maps() more resilient Adrian Hunter <adrian.hunter@intel.com> - 2015-09-08 10:10 +0200
    [tip:perf/core] perf evlist: Make set_maps() more resilient tip-bot for Adrian Hunter <tipbot@zytor.com> - 2015-09-16 09:40 +0200
  [PATCH V3 06/14] perf tools: Fix missing thread_map__put in perf_evlist__propagate_maps Adrian Hunter <adrian.hunter@intel.com> - 2015-09-08 10:10 +0200
    [tip:perf/core] perf evlist:   Fix missing thread_map__put in propagate_maps() tip-bot for Adrian Hunter <tipbot@zytor.com> - 2015-09-16 09:40 +0200

csiph-web