From: Adrian Hunter <adrian.hunter@intel.com>
To: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Jiri Olsa <jolsa@redhat.com>,
mingo@kernel.org, kan.liang@intel.com,
linux-kernel@vger.kernel.org
Subject: [PATCH V2 06/14] perf tools: Fix missing thread_map__put in perf_evlist__propagate_maps
Date: Mon, 7 Sep 2015 17:27:48 +0300 [thread overview]
Message-ID: <1441636076-31390-7-git-send-email-adrian.hunter@intel.com> (raw)
In-Reply-To: <1441636076-31390-1-git-send-email-adrian.hunter@intel.com>
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>
---
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 018b488d4c75..c959c42080e3 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);
}
}
--
1.9.1
next prev parent reply other threads:[~2015-09-07 14:31 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-07 14:27 [PATCH V2 00/14] perf tools: Fix gaps propagating maps Adrian Hunter
2015-09-07 14:27 ` [PATCH V2 01/14] perf tools: Simplify perf_evlist__propagate_maps logic Adrian Hunter
2015-09-07 14:27 ` [PATCH V2 02/14] perf tools: Simplify perf_evlist__set_maps logic Adrian Hunter
2015-09-07 14:27 ` [PATCH V2 03/14] perf tools: Remove redundant validation from perf_evlist__propagate_maps Adrian Hunter
2015-09-08 6:53 ` Jiri Olsa
2015-09-08 7:17 ` Adrian Hunter
2015-09-07 14:27 ` [PATCH V2 04/14] perf tools: Add evlist->has_user_cpus Adrian Hunter
2015-09-07 14:27 ` [PATCH V2 05/14] perf tools: Fix perf_evlist__splice_list_tail not setting evlist Adrian Hunter
2015-09-07 14:27 ` Adrian Hunter [this message]
2015-09-07 14:27 ` [PATCH V2 07/14] perf tools: Add evsel->own_cpus Adrian Hunter
2015-09-08 6:45 ` Jiri Olsa
2015-09-08 7:09 ` Adrian Hunter
2015-09-08 7:38 ` Jiri Olsa
2015-09-08 14:32 ` Arnaldo Carvalho de Melo
2015-09-07 14:27 ` [PATCH V2 08/14] perf tools: Make perf_evlist__set_maps() more resilient Adrian Hunter
2015-09-07 14:27 ` [PATCH V2 09/14] perf tools: Make perf_evlist__create_maps() use perf_evlist__set_maps() Adrian Hunter
2015-09-07 14:27 ` [PATCH V2 10/14] perf tools: Factor out a function to propagate maps for a single evsel Adrian Hunter
2015-09-07 14:27 ` [PATCH V2 11/14] perf tools: Fix perf_evlist__add() not propagating maps Adrian Hunter
2015-09-07 14:27 ` [PATCH V2 12/14] perf tools: Fix perf_evlist__create_syswide_maps() " Adrian Hunter
2015-09-07 14:27 ` [PATCH V2 13/14] perf tools: Fix task exit test setting maps Adrian Hunter
2015-09-07 14:27 ` [PATCH V2 14/14] perf tools: Fix software clock events " Adrian Hunter
2015-09-08 6:57 ` [PATCH V2 00/14] perf tools: Fix gaps propagating maps Jiri Olsa
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=1441636076-31390-7-git-send-email-adrian.hunter@intel.com \
--to=adrian.hunter@intel.com \
--cc=acme@redhat.com \
--cc=jolsa@redhat.com \
--cc=kan.liang@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome