linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Ingo Molnar <mingo@kernel.org>
Cc: linux-kernel@vger.kernel.org,
	Adrian Hunter <adrian.hunter@intel.com>,
	Kan Liang <kan.liang@intel.com>,
	Arnaldo Carvalho de Melo <acme@redhat.com>
Subject: [PATCH 09/15] perf evlist: Make set_maps() more resilient
Date: Tue, 15 Sep 2015 12:08:54 -0300	[thread overview]
Message-ID: <1442329740-18042-10-git-send-email-acme@kernel.org> (raw)
In-Reply-To: <1442329740-18042-1-git-send-email-acme@kernel.org>

From: Adrian Hunter <adrian.hunter@intel.com>

Make perf_evlist__set_maps() more resilient by allowing for the
possibility that one or another of the maps isn't being changed and
therefore should not be "put".

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-9-git-send-email-adrian.hunter@intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/util/evlist.c | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
index 5bd3b49452c6..78ff52ee8788 100644
--- a/tools/perf/util/evlist.c
+++ b/tools/perf/util/evlist.c
@@ -1155,11 +1155,22 @@ out_delete_threads:
 void perf_evlist__set_maps(struct perf_evlist *evlist, struct cpu_map *cpus,
 			   struct thread_map *threads)
 {
-	cpu_map__put(evlist->cpus);
-	evlist->cpus = cpus;
+	/*
+	 * Allow for the possibility that one or another of the maps isn't being
+	 * changed i.e. don't put it.  Note we are assuming the maps that are
+	 * being applied are brand new and evlist is taking ownership of the
+	 * original reference count of 1.  If that is not the case it is up to
+	 * the caller to increase the reference count.
+	 */
+	if (cpus != evlist->cpus) {
+		cpu_map__put(evlist->cpus);
+		evlist->cpus = cpus;
+	}
 
-	thread_map__put(evlist->threads);
-	evlist->threads = threads;
+	if (threads != evlist->threads) {
+		thread_map__put(evlist->threads);
+		evlist->threads = threads;
+	}
 
 	perf_evlist__propagate_maps(evlist);
 }
-- 
2.1.0


  parent reply	other threads:[~2015-09-15 15:10 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-09-15 15:08 [GIT PULL 00/15] perf/urgent fixes Arnaldo Carvalho de Melo
2015-09-15 15:08 ` [PATCH 01/15] perf top: Fix segfault pressing -> with no hist entries Arnaldo Carvalho de Melo
2015-09-15 15:08 ` [PATCH 02/15] perf evlist: Simplify propagate_maps() logic Arnaldo Carvalho de Melo
2015-09-15 15:08 ` [PATCH 03/15] perf evlist: Simplify set_maps() logic Arnaldo Carvalho de Melo
2015-09-15 15:08 ` [PATCH 04/15] perf evlist: Remove redundant validation from propagate_maps() Arnaldo Carvalho de Melo
2015-09-15 15:08 ` [PATCH 05/15] perf evlist: Add has_user_cpus member Arnaldo Carvalho de Melo
2015-09-15 15:08 ` [PATCH 06/15] perf evlist: Fix splice_list_tail() not setting evlist Arnaldo Carvalho de Melo
2015-09-15 15:08 ` [PATCH 07/15] perf evlist: Fix missing thread_map__put in propagate_maps() Arnaldo Carvalho de Melo
2015-09-15 15:08 ` [PATCH 08/15] perf evsel: Add own_cpus member Arnaldo Carvalho de Melo
2015-09-15 15:08 ` Arnaldo Carvalho de Melo [this message]
2015-09-15 15:08 ` [PATCH 10/15] perf evlist: Make create_maps() use set_maps() Arnaldo Carvalho de Melo
2015-09-15 15:08 ` [PATCH 11/15] perf evlist: Factor out a function to propagate maps for a single evsel Arnaldo Carvalho de Melo
2015-09-15 15:08 ` [PATCH 12/15] perf evlist: Fix add() not propagating maps Arnaldo Carvalho de Melo
2015-09-15 15:08 ` [PATCH 13/15] perf evlist: Fix create_syswide_maps() " Arnaldo Carvalho de Melo
2015-09-15 15:08 ` [PATCH 14/15] perf tests: Fix task exit test setting maps Arnaldo Carvalho de Melo
2015-09-15 15:09 ` [PATCH 15/15] perf tests: Fix software clock events " Arnaldo Carvalho de Melo
2015-09-16  7:09 ` [GIT PULL 00/15] perf/urgent fixes Ingo Molnar

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=1442329740-18042-10-git-send-email-acme@kernel.org \
    --to=acme@kernel.org \
    --cc=acme@redhat.com \
    --cc=adrian.hunter@intel.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;
as well as URLs for NNTP newsgroup(s).