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, Jiri Olsa <jolsa@kernel.org>,
	David Ahern <dsahern@gmail.com>,
	Namhyung Kim <namhyung@kernel.org>,
	Peter Zijlstra <a.p.zijlstra@chello.nl>,
	Arnaldo Carvalho de Melo <acme@redhat.com>
Subject: [PATCH 04/18] perf evlist: Tolerate NULL maps in propagate_maps
Date: Thu, 23 Jul 2015 22:58:17 -0300	[thread overview]
Message-ID: <1437703111-4930-5-git-send-email-acme@kernel.org> (raw)
In-Reply-To: <1437703111-4930-1-git-send-email-acme@kernel.org>

From: Jiri Olsa <jolsa@kernel.org>

Tolerating NULL maps in perf_evlist__propagate_maps, so we dont need to
pass evlist with both cpus and threads maps defined.

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1437481927-29538-10-git-send-email-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/util/evlist.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
index 80ab942afa8a..3b9f411a6b46 100644
--- a/tools/perf/util/evlist.c
+++ b/tools/perf/util/evlist.c
@@ -1119,7 +1119,8 @@ static int perf_evlist__propagate_maps(struct perf_evlist *evlist,
 
 		evsel->threads = thread_map__get(evlist->threads);
 
-		if (!evsel->cpus || !evsel->threads)
+		if ((evlist->cpus && !evsel->cpus) ||
+		    (evlist->threads && !evsel->threads))
 			return -ENOMEM;
 	}
 
-- 
2.1.0


  parent reply	other threads:[~2015-07-24  1:58 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-07-24  1:58 [GIT PULL 00/18] perf/core improvements and fixes Arnaldo Carvalho de Melo
2015-07-24  1:58 ` [PATCH 01/18] perf test: Check for refcnt in thread_map test Arnaldo Carvalho de Melo
2015-07-24  1:58 ` [PATCH 02/18] perf evlist: Force perf_evlist__set_maps to propagate maps through events Arnaldo Carvalho de Melo
2015-07-24  1:58 ` [PATCH 03/18] perf evlist: Use bool instead of target argument in propagate_maps() Arnaldo Carvalho de Melo
2015-07-24  1:58 ` Arnaldo Carvalho de Melo [this message]
2015-07-24  1:58 ` [PATCH 05/18] perf header: Use argv style storage for cmdline feature data Arnaldo Carvalho de Melo
2015-07-24  1:58 ` [PATCH 06/18] perf symbols: Add front end cache for DSO symbol lookup Arnaldo Carvalho de Melo
2015-07-24  1:58 ` [PATCH 07/18] perf symbols: Introduce map__is_(kernel,kmodule)() Arnaldo Carvalho de Melo
2015-07-24  1:58 ` [PATCH 08/18] tools lib traceevent: Allow setting an alternative symbol resolver Arnaldo Carvalho de Melo
2015-07-24  1:58 ` [PATCH 09/18] perf symbols: Provide libtraceevent callback to resolve kernel symbols Arnaldo Carvalho de Melo
2015-07-24  1:58 ` [PATCH 10/18] perf trace: Provide libtracevent with a kernel symbol resolver Arnaldo Carvalho de Melo
2015-07-24  1:58 ` [PATCH 11/18] perf script: Switch from perf.data's kallsyms to perf's " Arnaldo Carvalho de Melo
2015-08-03 17:41   ` Jiri Olsa
2015-08-03 19:00     ` Arnaldo Carvalho de Melo
2015-08-03 19:27       ` Arnaldo Carvalho de Melo
2015-08-03 20:12         ` Jiri Olsa
2015-07-24  1:58 ` [PATCH 12/18] perf tools: Stop reading the kallsyms data from perf.data Arnaldo Carvalho de Melo
2015-07-24  1:58 ` [PATCH 13/18] perf tools: Stop copying kallsyms into the perf.data file header Arnaldo Carvalho de Melo
2015-07-24  1:58 ` [PATCH 14/18] perf: Add PERF_RECORD_SWITCH to indicate context switches Arnaldo Carvalho de Melo
2015-07-24  1:58 ` [PATCH 15/18] perf tools: Add new PERF_RECORD_SWITCH event Arnaldo Carvalho de Melo
2015-07-24  1:58 ` [PATCH 16/18] perf record: Add option --switch-events to select PERF_RECORD_SWITCH events Arnaldo Carvalho de Melo
2015-07-24  1:58 ` [PATCH 17/18] perf script: Don't assume evsel position of tracking events Arnaldo Carvalho de Melo
2015-07-24  1:58 ` [PATCH 18/18] perf script: Add option --show-switch-events Arnaldo Carvalho de Melo
2015-07-27 15:58 ` [GIT PULL 00/18] perf/core improvements and 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=1437703111-4930-5-git-send-email-acme@kernel.org \
    --to=acme@kernel.org \
    --cc=a.p.zijlstra@chello.nl \
    --cc=acme@redhat.com \
    --cc=dsahern@gmail.com \
    --cc=jolsa@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=namhyung@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).