From: tip-bot for Adrian Hunter <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: acme@redhat.com, kan.liang@intel.com,
linux-kernel@vger.kernel.org, jolsa@kernel.org, hpa@zytor.com,
tglx@linutronix.de, adrian.hunter@intel.com, mingo@kernel.org
Subject: [tip:perf/core] perf evlist: Fix missing thread_map__put in propagate_maps()
Date: Wed, 16 Sep 2015 00:32:42 -0700 [thread overview]
Message-ID: <tip-b278c364b35ae940b05f6a9edf8061fc886cd09e@git.kernel.org> (raw)
In-Reply-To: <1441699142-18905-7-git-send-email-adrian.hunter@intel.com>
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);
}
}
next prev parent reply other threads:[~2015-09-16 7:32 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-08 7:58 [PATCH V3 00/14] perf tools: Fix gaps propagating maps Adrian Hunter
2015-09-08 7:58 ` [PATCH V3 01/14] perf tools: Simplify perf_evlist__propagate_maps logic Adrian Hunter
2015-09-16 7:30 ` [tip:perf/core] perf evlist: Simplify propagate_maps() logic tip-bot for Adrian Hunter
2015-09-08 7:58 ` [PATCH V3 02/14] perf tools: Simplify perf_evlist__set_maps logic Adrian Hunter
2015-09-16 7:31 ` [tip:perf/core] perf evlist: Simplify set_maps() logic tip-bot for Adrian Hunter
2015-09-08 7:58 ` [PATCH V3 03/14] perf tools: Remove redundant validation from perf_evlist__propagate_maps Adrian Hunter
2015-09-16 7:31 ` [tip:perf/core] perf evlist: Remove redundant validation from propagate_maps() tip-bot for Adrian Hunter
2015-09-08 7:58 ` [PATCH V3 04/14] perf tools: Add evlist->has_user_cpus Adrian Hunter
2015-09-16 7:32 ` [tip:perf/core] perf evlist: Add has_user_cpus member tip-bot for Adrian Hunter
2015-09-08 7:58 ` [PATCH V3 05/14] perf tools: Fix perf_evlist__splice_list_tail not setting evlist Adrian Hunter
2015-09-16 7:32 ` [tip:perf/core] perf evlist: Fix splice_list_tail() " tip-bot for Adrian Hunter
2015-09-08 7:58 ` [PATCH V3 06/14] perf tools: Fix missing thread_map__put in perf_evlist__propagate_maps Adrian Hunter
2015-09-16 7:32 ` tip-bot for Adrian Hunter [this message]
2015-09-08 7:58 ` [PATCH V3 07/14] perf tools: Add evsel->own_cpus Adrian Hunter
2015-09-16 7:33 ` [tip:perf/core] perf evsel: Add own_cpus member tip-bot for Adrian Hunter
2015-09-08 7:58 ` [PATCH V3 08/14] perf tools: Make perf_evlist__set_maps() more resilient Adrian Hunter
2015-09-16 7:33 ` [tip:perf/core] perf evlist: Make set_maps() " tip-bot for Adrian Hunter
2015-09-08 7:58 ` [PATCH V3 09/14] perf tools: Make perf_evlist__create_maps() use perf_evlist__set_maps() Adrian Hunter
2015-09-16 7:33 ` [tip:perf/core] perf evlist: Make create_maps() use set_maps() tip-bot for Adrian Hunter
2015-09-08 7:58 ` [PATCH V3 10/14] perf tools: Factor out a function to propagate maps for a single evsel Adrian Hunter
2015-09-16 7:34 ` [tip:perf/core] perf evlist: " tip-bot for Adrian Hunter
2015-09-08 7:58 ` [PATCH V3 11/14] perf tools: Fix perf_evlist__add() not propagating maps Adrian Hunter
2015-09-15 14:18 ` Arnaldo Carvalho de Melo
2015-09-16 7:34 ` [tip:perf/core] perf evlist: Fix add() " tip-bot for Adrian Hunter
2015-09-08 7:59 ` [PATCH V3 12/14] perf tools: Fix perf_evlist__create_syswide_maps() " Adrian Hunter
2015-09-16 7:34 ` [tip:perf/core] perf evlist: Fix create_syswide_maps() " tip-bot for Adrian Hunter
2015-09-08 7:59 ` [PATCH V3 13/14] perf tools: Fix task exit test setting maps Adrian Hunter
2015-09-16 7:35 ` [tip:perf/core] perf tests: " tip-bot for Adrian Hunter
2015-09-08 7:59 ` [PATCH V3 14/14] perf tools: Fix software clock events " Adrian Hunter
2015-09-16 7:35 ` [tip:perf/core] perf tests: " tip-bot for Adrian Hunter
2015-09-08 8:08 ` [PATCH V3 00/14] perf tools: Fix gaps propagating maps Jiri Olsa
2015-09-15 6:52 ` Adrian Hunter
2015-09-15 13:06 ` Arnaldo Carvalho de Melo
2015-09-15 14:17 ` Arnaldo Carvalho de Melo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-b278c364b35ae940b05f6a9edf8061fc886cd09e@git.kernel.org \
--to=tipbot@zytor.com \
--cc=acme@redhat.com \
--cc=adrian.hunter@intel.com \
--cc=hpa@zytor.com \
--cc=jolsa@kernel.org \
--cc=kan.liang@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.