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

perf cpu_map: Rename struct cpu_map to struct perf_cpu_map 



Rename struct cpu_map to struct perf_cpu_map, so it could be part of
libperf.

Committer notes:

Added fixes for arm64, provided by Jiri.

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-3-jolsa@kernel.org


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

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

+8 −8
Original line number Diff line number Diff line
@@ -155,8 +155,8 @@ static int cs_etm_set_option(struct auxtrace_record *itr, 
			     struct perf_evsel *evsel, u32 option)

{

	int i, err = -EINVAL;

	struct cpu_map *event_cpus = evsel->evlist->cpus;

	struct cpu_map *online_cpus = cpu_map__new(NULL);

	struct perf_cpu_map *event_cpus = evsel->evlist->cpus;

	struct perf_cpu_map *online_cpus = cpu_map__new(NULL);



	/* Set option of each CPU we have */

	for (i = 0; i < cpu__max_cpu(); i++) {
@@ -253,7 +253,7 @@ static int cs_etm_recording_options(struct auxtrace_record *itr, 
				container_of(itr, struct cs_etm_recording, itr);

	struct perf_pmu *cs_etm_pmu = ptr->cs_etm_pmu;

	struct perf_evsel *evsel, *cs_etm_evsel = NULL;

	struct cpu_map *cpus = evlist->cpus;

	struct perf_cpu_map *cpus = evlist->cpus;

	bool privileged = (geteuid() == 0 || perf_event_paranoid() < 0);

	int err = 0;
@@ -489,8 +489,8 @@ cs_etm_info_priv_size(struct auxtrace_record *itr __maybe_unused, 
{

	int i;

	int etmv3 = 0, etmv4 = 0;

	struct cpu_map *event_cpus = evlist->cpus;

	struct cpu_map *online_cpus = cpu_map__new(NULL);

	struct perf_cpu_map *event_cpus = evlist->cpus;

	struct perf_cpu_map *online_cpus = cpu_map__new(NULL);



	/* cpu map is not empty, we have specific CPUs to work with */

	if (!cpu_map__empty(event_cpus)) {
@@ -635,9 +635,9 @@ static int cs_etm_info_fill(struct auxtrace_record *itr, 
	int i;

	u32 offset;

	u64 nr_cpu, type;

	struct cpu_map *cpu_map;

	struct cpu_map *event_cpus = session->evlist->cpus;

	struct cpu_map *online_cpus = cpu_map__new(NULL);

	struct perf_cpu_map *cpu_map;

	struct perf_cpu_map *event_cpus = session->evlist->cpus;

	struct perf_cpu_map *online_cpus = cpu_map__new(NULL);

	struct cs_etm_recording *ptr =

			container_of(itr, struct cs_etm_recording, itr);

	struct perf_pmu *cs_etm_pmu = ptr->cs_etm_pmu;

tools/perf/arch/arm64/util/header.c

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ char *get_cpuid_str(struct perf_pmu *pmu) 
	const char *sysfs = sysfs__mountpoint();

	int cpu;

	u64 midr = 0;

	struct cpu_map *cpus;

	struct perf_cpu_map *cpus;

	FILE *file;



	if (!sysfs || !pmu || !pmu->cpus)

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

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ int test__perf_time_to_tsc(struct test *test __maybe_unused, int subtest __maybe 
		.sample_time	     = true,

	};

	struct thread_map *threads = NULL;

	struct cpu_map *cpus = NULL;

	struct perf_cpu_map *cpus = NULL;

	struct perf_evlist *evlist = NULL;

	struct perf_evsel *evsel = NULL;

	int err = -1, ret, i;

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

+1 −1
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ static int intel_bts_recording_options(struct auxtrace_record *itr, 
			container_of(itr, struct intel_bts_recording, itr);

	struct perf_pmu *intel_bts_pmu = btsr->intel_bts_pmu;

	struct perf_evsel *evsel, *intel_bts_evsel = NULL;

	const struct cpu_map *cpus = evlist->cpus;

	const struct perf_cpu_map *cpus = evlist->cpus;

	bool privileged = geteuid() == 0 || perf_event_paranoid() < 0;



	btsr->evlist = evlist;

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

+1 −1
Original line number Diff line number Diff line
@@ -557,7 +557,7 @@ static int intel_pt_recording_options(struct auxtrace_record *itr, 
	struct perf_pmu *intel_pt_pmu = ptr->intel_pt_pmu;

	bool have_timing_info, need_immediate = false;

	struct perf_evsel *evsel, *intel_pt_evsel = NULL;

	const struct cpu_map *cpus = evlist->cpus;

	const struct perf_cpu_map *cpus = evlist->cpus;

	bool privileged = geteuid() == 0 || perf_event_paranoid() < 0;

	u64 tsc_bit;

	int err;

CRA Git | Maintained and supported by SUSTech CRA and CCSE