Commit 52361ff0 authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo

perf evlist: Use bool instead of target argument in propagate_maps()

We need only bool info wether user defined her own set of cpus.

Switching target argument to bool so it could be used from places
without target object defined in following patches.
Signed-off-by: default avatarJiri 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-9-git-send-email-jolsa@kernel.orgSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 3de5cfb0
...@@ -1102,7 +1102,7 @@ int perf_evlist__mmap(struct perf_evlist *evlist, unsigned int pages, ...@@ -1102,7 +1102,7 @@ int perf_evlist__mmap(struct perf_evlist *evlist, unsigned int pages,
} }
static int perf_evlist__propagate_maps(struct perf_evlist *evlist, static int perf_evlist__propagate_maps(struct perf_evlist *evlist,
struct target *target) bool has_user_cpus)
{ {
struct perf_evsel *evsel; struct perf_evsel *evsel;
...@@ -1111,10 +1111,10 @@ static int perf_evlist__propagate_maps(struct perf_evlist *evlist, ...@@ -1111,10 +1111,10 @@ static int perf_evlist__propagate_maps(struct perf_evlist *evlist,
* We already have cpus for evsel (via PMU sysfs) so * We already have cpus for evsel (via PMU sysfs) so
* keep it, if there's no target cpu list defined. * keep it, if there's no target cpu list defined.
*/ */
if (evsel->cpus && target->cpu_list) if (evsel->cpus && has_user_cpus)
cpu_map__put(evsel->cpus); cpu_map__put(evsel->cpus);
if (!evsel->cpus || target->cpu_list) if (!evsel->cpus || has_user_cpus)
evsel->cpus = cpu_map__get(evlist->cpus); evsel->cpus = cpu_map__get(evlist->cpus);
evsel->threads = thread_map__get(evlist->threads); evsel->threads = thread_map__get(evlist->threads);
...@@ -1142,7 +1142,7 @@ int perf_evlist__create_maps(struct perf_evlist *evlist, struct target *target) ...@@ -1142,7 +1142,7 @@ int perf_evlist__create_maps(struct perf_evlist *evlist, struct target *target)
if (evlist->cpus == NULL) if (evlist->cpus == NULL)
goto out_delete_threads; goto out_delete_threads;
return perf_evlist__propagate_maps(evlist, target); return perf_evlist__propagate_maps(evlist, !!target->cpu_list);
out_delete_threads: out_delete_threads:
thread_map__put(evlist->threads); thread_map__put(evlist->threads);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment