Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1220576

[PATCH V3 01/14] perf tools: Simplify perf_evlist__propagate_maps logic

Show all headers | View raw

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>
---
 tools/perf/util/evlist.c | 5 ++---
 1 file 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);
 
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH V3 00/14] perf tools: Fix gaps propagating maps Adrian Hunter <adrian.hunter@intel.com> - 2015-09-08 10:10 +0200
  [PATCH V3 13/14] perf tools: Fix task exit test setting maps Adrian Hunter <adrian.hunter@intel.com> - 2015-09-08 10:10 +0200
    [tip:perf/core] perf tests: Fix task exit test setting maps tip-bot for Adrian Hunter <tipbot@zytor.com> - 2015-09-16 09:40 +0200
  [PATCH V3 01/14] perf tools: Simplify perf_evlist__propagate_maps logic Adrian Hunter <adrian.hunter@intel.com> - 2015-09-08 10:10 +0200
    [tip:perf/core] perf evlist: Simplify propagate_maps() logic tip-bot for Adrian Hunter <tipbot@zytor.com> - 2015-09-16 09:40 +0200
  [PATCH V3 12/14] perf tools: Fix perf_evlist__create_syswide_maps() not propagating maps Adrian Hunter <adrian.hunter@intel.com> - 2015-09-08 10:10 +0200
    [tip:perf/core] perf evlist: Fix create_syswide_maps()   not propagating maps tip-bot for Adrian Hunter <tipbot@zytor.com> - 2015-09-16 09:40 +0200
  [PATCH V3 09/14] perf tools: Make perf_evlist__create_maps() use perf_evlist__set_maps() Adrian Hunter <adrian.hunter@intel.com> - 2015-09-08 10:10 +0200
    [tip:perf/core] perf evlist: Make create_maps() use set_maps() tip-bot for Adrian Hunter <tipbot@zytor.com> - 2015-09-16 09:40 +0200
  [PATCH V3 08/14] perf tools: Make perf_evlist__set_maps() more resilient Adrian Hunter <adrian.hunter@intel.com> - 2015-09-08 10:10 +0200
    [tip:perf/core] perf evlist: Make set_maps() more resilient tip-bot for Adrian Hunter <tipbot@zytor.com> - 2015-09-16 09:40 +0200
  [PATCH V3 06/14] perf tools: Fix missing thread_map__put in perf_evlist__propagate_maps Adrian Hunter <adrian.hunter@intel.com> - 2015-09-08 10:10 +0200
    [tip:perf/core] perf evlist:   Fix missing thread_map__put in propagate_maps() tip-bot for Adrian Hunter <tipbot@zytor.com> - 2015-09-16 09:40 +0200

csiph-web