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

libperf: Add cpus to struct perf_evlist 



Move cpus from tools/perf's evlist to libperf's perf_evlist struct.

Committer notes:

Fixed up this one:

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

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


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

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

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

{

	int i, err = -EINVAL;

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

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

	struct perf_cpu_map *online_cpus = perf_cpu_map__new(NULL);



	/* Set option of each CPU we have */
@@ -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 evsel *evsel, *cs_etm_evsel = NULL;

	struct perf_cpu_map *cpus = evlist->cpus;

	struct perf_cpu_map *cpus = evlist->core.cpus;

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

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

	int i;

	int etmv3 = 0, etmv4 = 0;

	struct perf_cpu_map *event_cpus = evlist->cpus;

	struct perf_cpu_map *event_cpus = evlist->core.cpus;

	struct perf_cpu_map *online_cpus = perf_cpu_map__new(NULL);



	/* cpu map is not empty, we have specific CPUs to work with */
@@ -636,7 +636,7 @@ static int cs_etm_info_fill(struct auxtrace_record *itr, 
	u32 offset;

	u64 nr_cpu, type;

	struct perf_cpu_map *cpu_map;

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

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

	struct perf_cpu_map *online_cpus = perf_cpu_map__new(NULL);

	struct cs_etm_recording *ptr =

			container_of(itr, struct cs_etm_recording, itr);

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 evsel *evsel, *intel_bts_evsel = NULL;

	const struct perf_cpu_map *cpus = evlist->cpus;

	const struct perf_cpu_map *cpus = evlist->core.cpus;

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



	btsr->evlist = evlist;

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

+2 −2
Original line number Diff line number Diff line
@@ -365,7 +365,7 @@ static int intel_pt_info_fill(struct auxtrace_record *itr, 
			ui__warning("Intel Processor Trace: TSC not available\n");

	}



	per_cpu_mmaps = !cpu_map__empty(session->evlist->cpus);

	per_cpu_mmaps = !cpu_map__empty(session->evlist->core.cpus);



	auxtrace_info->type = PERF_AUXTRACE_INTEL_PT;

	auxtrace_info->priv[INTEL_PT_PMU_TYPE] = intel_pt_pmu->type;
@@ -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 evsel *evsel, *intel_pt_evsel = NULL;

	const struct perf_cpu_map *cpus = evlist->cpus;

	const struct perf_cpu_map *cpus = evlist->core.cpus;

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

	u64 tsc_bit;

	int err;

tools/perf/builtin-ftrace.c

+1 −1
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ static int set_tracing_cpumask(struct perf_cpu_map *cpumap) 


static int set_tracing_cpu(struct perf_ftrace *ftrace)

{

	struct perf_cpu_map *cpumap = ftrace->evlist->cpus;

	struct perf_cpu_map *cpumap = ftrace->evlist->core.cpus;



	if (!target__has_cpu(&ftrace->target))

		return 0;

tools/perf/builtin-record.c

+1 −1
Original line number Diff line number Diff line
@@ -1283,7 +1283,7 @@ static int record__synthesize(struct record *rec, bool tail) 
		return err;

	}



	err = perf_event__synthesize_cpu_map(&rec->tool, rec->evlist->cpus,

	err = perf_event__synthesize_cpu_map(&rec->tool, rec->evlist->core.cpus,

					     process_synthesized_event, NULL);

	if (err < 0) {

		pr_err("Couldn't synthesize cpu map.\n");

CRA Git | Maintained and supported by SUSTech CRA and CCSE