Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 74bfd2b2 authored by Adrian Hunter's avatar Adrian Hunter Committed by Arnaldo Carvalho de Melo
Browse files

perf evlist: Make create_maps() use set_maps() 



Since there is a function to set maps, perf_evlist__create_maps() should
use it.

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-10-git-send-email-adrian.hunter@intel.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 934e0f20

tools/perf/util/evlist.c

+10 −9
Original line number Diff line number Diff line
@@ -1126,29 +1126,30 @@ static void perf_evlist__propagate_maps(struct perf_evlist *evlist) 


int perf_evlist__create_maps(struct perf_evlist *evlist, struct target *target)

{

	evlist->threads = thread_map__new_str(target->pid, target->tid,

					      target->uid);

	struct cpu_map *cpus;

	struct thread_map *threads;



	if (evlist->threads == NULL)

	threads = thread_map__new_str(target->pid, target->tid, target->uid);



	if (!threads)

		return -1;



	if (target__uses_dummy_map(target))

		evlist->cpus = cpu_map__dummy_new();

		cpus = cpu_map__dummy_new();

	else

		evlist->cpus = cpu_map__new(target->cpu_list);

		cpus = cpu_map__new(target->cpu_list);



	if (evlist->cpus == NULL)

	if (!cpus)

		goto out_delete_threads;



	evlist->has_user_cpus = !!target->cpu_list;



	perf_evlist__propagate_maps(evlist);

	perf_evlist__set_maps(evlist, cpus, threads);



	return 0;



out_delete_threads:

	thread_map__put(evlist->threads);

	evlist->threads = NULL;

	thread_map__put(threads);

	return -1;

}