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

Commit ec903f26 authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo
Browse files

libperf: Add has_user_cpus to struct perf_evlist 



Move has_user_cpus from tools/perf's evlist to libbperf's perf_evlist struct.

Signed-off-by: default avatarJiri Olsa <jolsa@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Alexey Budankov <alexey.budankov@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Michael Petlan <mpetlan@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20190721112506.12306-54-jolsa@kernel.org


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

tools/perf/lib/include/internal/evlist.h

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
struct perf_evlist {

	struct list_head	entries;

	int			nr_entries;

	bool			has_user_cpus;

};



#endif /* __LIBPERF_INTERNAL_EVLIST_H */

tools/perf/util/evlist.c

+2 −2
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ static void __perf_evlist__propagate_maps(struct evlist *evlist, 
	 * We already have cpus for evsel (via PMU sysfs) so

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

	 */

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

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

		perf_cpu_map__put(evsel->core.cpus);

		evsel->core.cpus = perf_cpu_map__get(evlist->cpus);

	} else if (evsel->core.cpus != evsel->core.own_cpus) {
@@ -1095,7 +1095,7 @@ int perf_evlist__create_maps(struct evlist *evlist, struct target *target) 
	if (!cpus)

		goto out_delete_threads;



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

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



	perf_evlist__set_maps(evlist, cpus, threads);

tools/perf/util/evlist.h

+0 −1
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ struct evlist { 
	int		 nr_groups;

	int		 nr_mmaps;

	bool		 enabled;

	bool		 has_user_cpus;

	size_t		 mmap_len;

	int		 id_pos;

	int		 is_pos;