[PATCH 09/47] perf tools: Tolerate NULL maps in perf_evlist__propagate_maps

Jiri Olsa
2015-07-21T12:32:30Z

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

Link: http://lkml.kernel.org/n/tip-y15hjmv6uu8b6gyhkz5v41rw@git.kernel.org
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
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 63bc24dbf03b..f1714bedd5de 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.4.3