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

perf evlist: Rename struct perf_evlist to struct evlist 



Rename struct perf_evlist to struct evlist, so we don't have a name
clash when we add struct perf_evlist in libperf.

Committer notes:

Added fixes to build on arm64, from Jiri and from me
(tools/perf/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-6-jolsa@kernel.org


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

tools/perf/arch/arm/util/auxtrace.c

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ static struct perf_pmu **find_all_arm_spe_pmus(int *nr_spes, int *err) 
}



struct auxtrace_record

*auxtrace_record__init(struct perf_evlist *evlist, int *err)

*auxtrace_record__init(struct evlist *evlist, int *err)

{

	struct perf_pmu	*cs_etm_pmu;

	struct evsel *evsel;

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

+4 −4
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 
struct cs_etm_recording {

	struct auxtrace_record	itr;

	struct perf_pmu		*cs_etm_pmu;

	struct perf_evlist	*evlist;

	struct evlist		*evlist;

	int			wrapped_cnt;

	bool			*wrapped;

	bool			snapshot_mode;
@@ -245,7 +245,7 @@ static int cs_etm_set_sink_attr(struct perf_pmu *pmu, 
}



static int cs_etm_recording_options(struct auxtrace_record *itr,

				    struct perf_evlist *evlist,

				    struct evlist *evlist,

				    struct record_opts *opts)

{

	int ret;
@@ -434,7 +434,7 @@ static u64 cs_etm_get_config(struct auxtrace_record *itr) 
	struct cs_etm_recording *ptr =

			container_of(itr, struct cs_etm_recording, itr);

	struct perf_pmu *cs_etm_pmu = ptr->cs_etm_pmu;

	struct perf_evlist *evlist = ptr->evlist;

	struct evlist *evlist = ptr->evlist;

	struct evsel *evsel;



	evlist__for_each_entry(evlist, evsel) {
@@ -485,7 +485,7 @@ static u64 cs_etmv4_get_config(struct auxtrace_record *itr) 


static size_t

cs_etm_info_priv_size(struct auxtrace_record *itr __maybe_unused,

		      struct perf_evlist *evlist __maybe_unused)

		      struct evlist *evlist __maybe_unused)

{

	int i;

	int etmv3 = 0, etmv4 = 0;

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

+3 −3
Original line number Diff line number Diff line
@@ -27,12 +27,12 @@ 
struct arm_spe_recording {

	struct auxtrace_record		itr;

	struct perf_pmu			*arm_spe_pmu;

	struct perf_evlist		*evlist;

	struct evlist		*evlist;

};



static size_t

arm_spe_info_priv_size(struct auxtrace_record *itr __maybe_unused,

		       struct perf_evlist *evlist __maybe_unused)

		       struct evlist *evlist __maybe_unused)

{

	return ARM_SPE_AUXTRACE_PRIV_SIZE;

}
@@ -59,7 +59,7 @@ static int arm_spe_info_fill(struct auxtrace_record *itr, 
}



static int arm_spe_recording_options(struct auxtrace_record *itr,

				     struct perf_evlist *evlist,

				     struct evlist *evlist,

				     struct record_opts *opts)

{

	struct arm_spe_recording *sper =

tools/perf/arch/powerpc/util/kvm-stat.c

+3 −3
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ const char * const kvm_skip_events[] = { 
};





static int is_tracepoint_available(const char *str, struct perf_evlist *evlist)

static int is_tracepoint_available(const char *str, struct evlist *evlist)

{

	struct parse_events_error err;

	int ret;
@@ -119,7 +119,7 @@ static int is_tracepoint_available(const char *str, struct perf_evlist *evlist) 
}



static int ppc__setup_book3s_hv(struct perf_kvm_stat *kvm,

				struct perf_evlist *evlist)

				struct evlist *evlist)

{

	const char **events_ptr;

	int i, nr_tp = 0, err = -1;
@@ -146,7 +146,7 @@ static int ppc__setup_book3s_hv(struct perf_kvm_stat *kvm, 
/* Wrapper to setup kvm tracepoints */

static int ppc__setup_kvm_tp(struct perf_kvm_stat *kvm)

{

	struct perf_evlist *evlist = perf_evlist__new();

	struct evlist *evlist = perf_evlist__new();



	if (evlist == NULL)

		return -ENOMEM;

tools/perf/arch/s390/util/auxtrace.c

+3 −3
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ static void cpumsf_free(struct auxtrace_record *itr) 
}



static size_t cpumsf_info_priv_size(struct auxtrace_record *itr __maybe_unused,

				    struct perf_evlist *evlist __maybe_unused)

				    struct evlist *evlist __maybe_unused)

{

	return 0;

}
@@ -43,7 +43,7 @@ cpumsf_reference(struct auxtrace_record *itr __maybe_unused) 


static int

cpumsf_recording_options(struct auxtrace_record *ar __maybe_unused,

			 struct perf_evlist *evlist __maybe_unused,

			 struct evlist *evlist __maybe_unused,

			 struct record_opts *opts)

{

	unsigned int factor = 1;
@@ -82,7 +82,7 @@ cpumsf_parse_snapshot_options(struct auxtrace_record *itr __maybe_unused, 
 * auxtrace_record__init is called when perf record

 * check if the event really need auxtrace

 */

struct auxtrace_record *auxtrace_record__init(struct perf_evlist *evlist,

struct auxtrace_record *auxtrace_record__init(struct evlist *evlist,

					      int *err)

{

	struct auxtrace_record *aux;

CRA Git | Maintained and supported by SUSTech CRA and CCSE