[tip:perf/core] perf evlist: Tolerate NULL maps in propagate_maps

tip-bot for Jiri Olsa
2015-07-29T08:11:28Z

Commit-ID: 0e5ffb317d7f861c309b0ab679ed2f59e9f72adf
Gitweb: http://git.kernel.org/tip/0e5ffb317d7f861c309b0ab679ed2f59e9f72adf
Author: Jiri Olsa <jolsa@kernel.org>
AuthorDate: Tue, 21 Jul 2015 14:31:29 +0200
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Tue, 21 Jul 2015 14:34:07 -0300

perf evlist: Tolerate NULL maps in propagate_maps

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 80ab942..3b9f411 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;
}