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

perf evsel: Rename struct perf_evsel to struct evsel 



Rename struct perf_evsel to struct evsel, so we don't have a name clash
when we add struct perf_evsel in 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-5-jolsa@kernel.org


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

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

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ struct auxtrace_record 
*auxtrace_record__init(struct perf_evlist *evlist, int *err)

{

	struct perf_pmu	*cs_etm_pmu;

	struct perf_evsel *evsel;

	struct evsel *evsel;

	bool found_etm = false;

	bool found_spe = false;

	static struct perf_pmu **arm_spe_pmus = NULL;

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

+10 −10
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ static const char *metadata_etmv4_ro[CS_ETMV4_PRIV_MAX] = { 
static bool cs_etm_is_etmv4(struct auxtrace_record *itr, int cpu);



static int cs_etm_set_context_id(struct auxtrace_record *itr,

				 struct perf_evsel *evsel, int cpu)

				 struct evsel *evsel, int cpu)

{

	struct cs_etm_recording *ptr;

	struct perf_pmu *cs_etm_pmu;
@@ -104,7 +104,7 @@ out: 
}



static int cs_etm_set_timestamp(struct auxtrace_record *itr,

				struct perf_evsel *evsel, int cpu)

				struct evsel *evsel, int cpu)

{

	struct cs_etm_recording *ptr;

	struct perf_pmu *cs_etm_pmu;
@@ -152,7 +152,7 @@ out: 
}



static int cs_etm_set_option(struct auxtrace_record *itr,

			     struct perf_evsel *evsel, u32 option)

			     struct evsel *evsel, u32 option)

{

	int i, err = -EINVAL;

	struct perf_cpu_map *event_cpus = evsel->evlist->cpus;
@@ -208,7 +208,7 @@ static int cs_etm_parse_snapshot_options(struct auxtrace_record *itr, 
}



static int cs_etm_set_sink_attr(struct perf_pmu *pmu,

				struct perf_evsel *evsel)

				struct evsel *evsel)

{

	char msg[BUFSIZ], path[PATH_MAX], *sink;

	struct perf_evsel_config_term *term;
@@ -252,7 +252,7 @@ static int cs_etm_recording_options(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_evsel *evsel, *cs_etm_evsel = NULL;

	struct evsel *evsel, *cs_etm_evsel = NULL;

	struct perf_cpu_map *cpus = evlist->cpus;

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

	int err = 0;
@@ -407,7 +407,7 @@ static int cs_etm_recording_options(struct auxtrace_record *itr, 


	/* Add dummy event to keep tracking */

	if (opts->full_auxtrace) {

		struct perf_evsel *tracking_evsel;

		struct evsel *tracking_evsel;



		err = parse_events(evlist, "dummy:u", NULL);

		if (err)
@@ -435,7 +435,7 @@ static u64 cs_etm_get_config(struct auxtrace_record *itr) 
			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 perf_evsel *evsel;

	struct evsel *evsel;



	evlist__for_each_entry(evlist, evsel) {

		if (evsel->attr.type == cs_etm_pmu->type) {
@@ -817,7 +817,7 @@ static int cs_etm_snapshot_start(struct auxtrace_record *itr) 
{

	struct cs_etm_recording *ptr =

			container_of(itr, struct cs_etm_recording, itr);

	struct perf_evsel *evsel;

	struct evsel *evsel;



	evlist__for_each_entry(ptr->evlist, evsel) {

		if (evsel->attr.type == ptr->cs_etm_pmu->type)
@@ -830,7 +830,7 @@ static int cs_etm_snapshot_finish(struct auxtrace_record *itr) 
{

	struct cs_etm_recording *ptr =

			container_of(itr, struct cs_etm_recording, itr);

	struct perf_evsel *evsel;

	struct evsel *evsel;



	evlist__for_each_entry(ptr->evlist, evsel) {

		if (evsel->attr.type == ptr->cs_etm_pmu->type)
@@ -858,7 +858,7 @@ static int cs_etm_read_finish(struct auxtrace_record *itr, int idx) 
{

	struct cs_etm_recording *ptr =

			container_of(itr, struct cs_etm_recording, itr);

	struct perf_evsel *evsel;

	struct evsel *evsel;



	evlist__for_each_entry(ptr->evlist, evsel) {

		if (evsel->attr.type == ptr->cs_etm_pmu->type)

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

+3 −3
Original line number Diff line number Diff line
@@ -65,9 +65,9 @@ static int arm_spe_recording_options(struct auxtrace_record *itr, 
	struct arm_spe_recording *sper =

			container_of(itr, struct arm_spe_recording, itr);

	struct perf_pmu *arm_spe_pmu = sper->arm_spe_pmu;

	struct perf_evsel *evsel, *arm_spe_evsel = NULL;

	struct evsel *evsel, *arm_spe_evsel = NULL;

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

	struct perf_evsel *tracking_evsel;

	struct evsel *tracking_evsel;

	int err;



	sper->evlist = evlist;
@@ -160,7 +160,7 @@ static int arm_spe_read_finish(struct auxtrace_record *itr, int idx) 
{

	struct arm_spe_recording *sper =

			container_of(itr, struct arm_spe_recording, itr);

	struct perf_evsel *evsel;

	struct evsel *evsel;



	evlist__for_each_entry(sper->evlist, evsel) {

		if (evsel->attr.type == sper->arm_spe_pmu->type)

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

+3 −3
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ const char *ppc_book3s_hv_kvm_tp[] = { 
const char *kvm_events_tp[NR_TPS + 1];

const char *kvm_exit_reason;



static void hcall_event_get_key(struct perf_evsel *evsel,

static void hcall_event_get_key(struct evsel *evsel,

				struct perf_sample *sample,

				struct event_key *key)

{
@@ -55,14 +55,14 @@ static const char *get_hcall_exit_reason(u64 exit_code) 
	return "UNKNOWN";

}



static bool hcall_event_end(struct perf_evsel *evsel,

static bool hcall_event_end(struct evsel *evsel,

			    struct perf_sample *sample __maybe_unused,

			    struct event_key *key __maybe_unused)

{

	return (!strcmp(evsel->name, kvm_events_tp[3]));

}



static bool hcall_event_begin(struct perf_evsel *evsel,

static bool hcall_event_begin(struct evsel *evsel,

			      struct perf_sample *sample, struct event_key *key)

{

	if (!strcmp(evsel->name, kvm_events_tp[2])) {

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

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ struct auxtrace_record *auxtrace_record__init(struct perf_evlist *evlist, 
					      int *err)

{

	struct auxtrace_record *aux;

	struct perf_evsel *pos;

	struct evsel *pos;

	int diagnose = 0;



	*err = 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE