Commit a69b09e2 authored by Adrian Hunter's avatar Adrian Hunter Committed by Arnaldo Carvalho de Melo

perf evlist: Simplify propagate_maps() logic

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: default avatarAdrian Hunter <adrian.hunter@intel.com>
Acked-by: default avatarJiri Olsa <jolsa@kernel.org>
Cc: Kan Liang <kan.liang@intel.com>
Link: http://lkml.kernel.org/r/1441699142-18905-2-git-send-email-adrian.hunter@intel.comSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent bd315aab
...@@ -1113,11 +1113,10 @@ static int perf_evlist__propagate_maps(struct perf_evlist *evlist, ...@@ -1113,11 +1113,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 && has_user_cpus) if (!evsel->cpus || has_user_cpus) {
cpu_map__put(evsel->cpus); cpu_map__put(evsel->cpus);
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);
......
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