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: Adrian Hunter <adrian.hunter@intel.com> Acked-by: Jiri 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.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
parent
bd315aab8a
commit
a69b09e234
@ -1113,11 +1113,10 @@ static int perf_evlist__propagate_maps(struct perf_evlist *evlist,
|
||||
* We already have cpus for evsel (via PMU sysfs) so
|
||||
* 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);
|
||||
|
||||
if (!evsel->cpus || has_user_cpus)
|
||||
evsel->cpus = cpu_map__get(evlist->cpus);
|
||||
}
|
||||
|
||||
evsel->threads = thread_map__get(evlist->threads);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user