diff options
| author | Adrian Hunter <adrian.hunter@intel.com> | 2015-09-08 10:58:49 +0300 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2015-09-15 10:08:22 -0300 |
| commit | a69b09e2342a9c144b0291b9aeb849ab7d5843bf (patch) | |
| tree | 271faf685e2a652aa4b2669e9ffa47832df20ceb /tools | |
| parent | bd315aab8a3ab1bc7074774b89a5d8ec7c1ff7ab (diff) | |
| download | linux-stable-a69b09e2342a9c144b0291b9aeb849ab7d5843bf.tar.gz linux-stable-a69b09e2342a9c144b0291b9aeb849ab7d5843bf.tar.bz2 linux-stable-a69b09e2342a9c144b0291b9aeb849ab7d5843bf.zip | |
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>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/perf/util/evlist.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c index d51a5200c8af..95e07ea3904c 100644 --- a/tools/perf/util/evlist.c +++ b/tools/perf/util/evlist.c @@ -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); |