public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
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 V3 01/14] perf tools: Simplify perf_evlist__propagate_maps logic
Date: Tue,  8 Sep 2015 10:58:49 +0300	[thread overview]
Message-ID: <1441699142-18905-2-git-send-email-adrian.hunter@intel.com> (raw)
In-Reply-To: <1441699142-18905-1-git-send-email-adrian.hunter@intel.com>

If evsel->cpus is to be reassigned then the current value
must be "put", which works even if it is NULL.  Simplify
the current logic by moving the "put" next to the assignment.

Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
---
 tools/perf/util/evlist.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
index d51a5200c8af..95e07ea3904c 100644
--- a/tools/perf/util/evlist.c
+++ b/tools/perf/util/evlist.c
@@ -1113,11 +1113,10 @@ static int perf_evlist__propagate_maps(struct perf_evlist *evlist,
 		 * We already have cpus for evsel (via PMU sysfs) so
 		 * keep it, if there's no target cpu list defined.
 		 */
-		if (evsel->cpus && has_user_cpus)
+		if (!evsel->cpus || has_user_cpus) {
 			cpu_map__put(evsel->cpus);
-
-		if (!evsel->cpus || has_user_cpus)
 			evsel->cpus = cpu_map__get(evlist->cpus);
+		}
 
 		evsel->threads = thread_map__get(evlist->threads);
 
-- 
1.9.1


  reply	other threads:[~2015-09-08  8:01 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 ` Adrian Hunter [this message]
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:perf/core] perf evlist: Fix missing thread_map__put in propagate_maps() tip-bot for Adrian Hunter
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=1441699142-18905-2-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