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

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: 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-13-git-send-email-adrian.hunter@intel.comSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 44c42d71
...@@ -1400,6 +1400,8 @@ void perf_evlist__close(struct perf_evlist *evlist) ...@@ -1400,6 +1400,8 @@ void perf_evlist__close(struct perf_evlist *evlist)
static int perf_evlist__create_syswide_maps(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; int err = -ENOMEM;
/* /*
...@@ -1411,20 +1413,19 @@ static int perf_evlist__create_syswide_maps(struct perf_evlist *evlist) ...@@ -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 * error, and we may not want to do that fallback to a
* default cpu identity map :-\ * default cpu identity map :-\
*/ */
evlist->cpus = cpu_map__new(NULL); cpus = cpu_map__new(NULL);
if (evlist->cpus == NULL) if (!cpus)
goto out; goto out;
evlist->threads = thread_map__new_dummy(); threads = thread_map__new_dummy();
if (evlist->threads == NULL) if (!threads)
goto out_free_cpus; goto out_put;
err = 0; perf_evlist__set_maps(evlist, cpus, threads);
out: out:
return err; return err;
out_free_cpus: out_put:
cpu_map__put(evlist->cpus); cpu_map__put(cpus);
evlist->cpus = NULL;
goto out; goto out;
} }
......
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