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

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

perf evlist: Factor out a function to propagate maps for a single evsel 



Subsequent fixes will need a function that just propagates maps for a
single evsel so factor it out.

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


[ Moved them to before perf_evlist__add() to avoid having to move it in the next patch ]
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 74bfd2b2

tools/perf/util/evlist.c

+27 −22
Original line number Diff line number Diff line
@@ -124,6 +124,33 @@ void perf_evlist__delete(struct perf_evlist *evlist) 
	free(evlist);

}



static void __perf_evlist__propagate_maps(struct perf_evlist *evlist,

					  struct perf_evsel *evsel)

{

	/*

	 * We already have cpus for evsel (via PMU sysfs) so

	 * keep it, if there's no target cpu list defined.

	 */

	if (!evsel->own_cpus || evlist->has_user_cpus) {

		cpu_map__put(evsel->cpus);

		evsel->cpus = cpu_map__get(evlist->cpus);

	} else if (evsel->cpus != evsel->own_cpus) {

		cpu_map__put(evsel->cpus);

		evsel->cpus = cpu_map__get(evsel->own_cpus);

	}



	thread_map__put(evsel->threads);

	evsel->threads = thread_map__get(evlist->threads);

}



static void perf_evlist__propagate_maps(struct perf_evlist *evlist)

{

	struct perf_evsel *evsel;



	evlist__for_each(evlist, evsel)

		__perf_evlist__propagate_maps(evlist, evsel);

}



void perf_evlist__add(struct perf_evlist *evlist, struct perf_evsel *entry)

{

	entry->evlist = evlist;
@@ -1102,28 +1129,6 @@ int perf_evlist__mmap(struct perf_evlist *evlist, unsigned int pages, 
	return perf_evlist__mmap_ex(evlist, pages, overwrite, 0, false);

}



static void perf_evlist__propagate_maps(struct perf_evlist *evlist)

{

	struct perf_evsel *evsel;



	evlist__for_each(evlist, evsel) {

		/*

		 * We already have cpus for evsel (via PMU sysfs) so

		 * keep it, if there's no target cpu list defined.

		 */

		if (!evsel->own_cpus || evlist->has_user_cpus) {

			cpu_map__put(evsel->cpus);

			evsel->cpus = cpu_map__get(evlist->cpus);

		} else if (evsel->cpus != evsel->own_cpus) {

			cpu_map__put(evsel->cpus);

			evsel->cpus = cpu_map__get(evsel->own_cpus);

		}



		thread_map__put(evsel->threads);

		evsel->threads = thread_map__get(evlist->threads);

	}

}



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

{

	struct cpu_map *cpus;