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

libperf: Move 'nr_mmaps' from 'struct evlist' to 'struct perf_evlist' 



Moving 'nr_mmaps' from 'struct evlist' to 'struct perf_evlist', it will
be used in following patches.

Signed-off-by: default avatarJiri Olsa <jolsa@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Michael Petlan <mpetlan@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lore.kernel.org/lkml/20190913132355.21634-21-jolsa@kernel.org


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

tools/perf/arch/arm/util/cs-etm.c

+1 −1
Original line number Diff line number Diff line
@@ -648,7 +648,7 @@ static int cs_etm_info_fill(struct auxtrace_record *itr, 
	if (priv_size != cs_etm_info_priv_size(itr, session->evlist))

		return -EINVAL;



	if (!session->evlist->nr_mmaps)

	if (!session->evlist->core.nr_mmaps)

		return -EINVAL;



	/* If the cpu_map is empty all online CPUs are involved */

tools/perf/arch/arm64/util/arm-spe.c

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ static int arm_spe_info_fill(struct auxtrace_record *itr, 
	if (priv_size != ARM_SPE_AUXTRACE_PRIV_SIZE)

		return -EINVAL;



	if (!session->evlist->nr_mmaps)

	if (!session->evlist->core.nr_mmaps)

		return -EINVAL;



	auxtrace_info->type = PERF_AUXTRACE_ARM_SPE;

tools/perf/arch/x86/tests/perf-time-to-tsc.c

+1 −1
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ int test__perf_time_to_tsc(struct test *test __maybe_unused, int subtest __maybe 


	evlist__disable(evlist);



	for (i = 0; i < evlist->nr_mmaps; i++) {

	for (i = 0; i < evlist->core.nr_mmaps; i++) {

		md = &evlist->mmap[i];

		if (perf_mmap__read_init(md) < 0)

			continue;

tools/perf/arch/x86/util/intel-bts.c

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ static int intel_bts_info_fill(struct auxtrace_record *itr, 
	if (priv_size != INTEL_BTS_AUXTRACE_PRIV_SIZE)

		return -EINVAL;



	if (!session->evlist->nr_mmaps)

	if (!session->evlist->core.nr_mmaps)

		return -EINVAL;



	pc = session->evlist->mmap[0].core.base;

tools/perf/arch/x86/util/intel-pt.c

+1 −1
Original line number Diff line number Diff line
@@ -352,7 +352,7 @@ static int intel_pt_info_fill(struct auxtrace_record *itr, 
	filter = intel_pt_find_filter(session->evlist, ptr->intel_pt_pmu);

	filter_str_len = filter ? strlen(filter) : 0;



	if (!session->evlist->nr_mmaps)

	if (!session->evlist->core.nr_mmaps)

		return -EINVAL;



	pc = session->evlist->mmap[0].core.base;

CRA Git | Maintained and supported by SUSTech CRA and CCSE