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

Groups > linux.kernel > #1225794

[tip:perf/core] perf evlist: Fix create_syswide_maps() not propagating maps

Show all headers | View raw

Commit-ID:  8c0498b6891d7ca5c379c6283de7fc7fe8eebe5c
Gitweb:     http://git.kernel.org/tip/8c0498b6891d7ca5c379c6283de7fc7fe8eebe5c
Author:     Adrian Hunter <adrian.hunter@intel.com>
AuthorDate: Tue, 8 Sep 2015 10:59:00 +0300
Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Tue, 15 Sep 2015 11:03:22 -0300

perf evlist: Fix create_syswide_maps() not propagating maps

Fix it by making it call perf_evlist__set_maps() instead of setting the
maps itself.

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-13-git-send-email-adrian.hunter@intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/util/evlist.c | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
index 99267ab..c8fc8a2 100644
--- a/tools/perf/util/evlist.c
+++ b/tools/perf/util/evlist.c
@@ -1400,6 +1400,8 @@ void perf_evlist__close(struct perf_evlist *evlist)
 
 static int perf_evlist__create_syswide_maps(struct perf_evlist *evlist)
 {
+	struct cpu_map	  *cpus;
+	struct thread_map *threads;
 	int err = -ENOMEM;
 
 	/*
@@ -1411,20 +1413,19 @@ static int perf_evlist__create_syswide_maps(struct perf_evlist *evlist)
 	 * error, and we may not want to do that fallback to a
 	 * default cpu identity map :-\
 	 */
-	evlist->cpus = cpu_map__new(NULL);
-	if (evlist->cpus == NULL)
+	cpus = cpu_map__new(NULL);
+	if (!cpus)
 		goto out;
 
-	evlist->threads = thread_map__new_dummy();
-	if (evlist->threads == NULL)
-		goto out_free_cpus;
+	threads = thread_map__new_dummy();
+	if (!threads)
+		goto out_put;
 
-	err = 0;
+	perf_evlist__set_maps(evlist, cpus, threads);
 out:
 	return err;
-out_free_cpus:
-	cpu_map__put(evlist->cpus);
-	evlist->cpus = NULL;
+out_put:
+	cpu_map__put(cpus);
 	goto out;
 }
 
--
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