Commit 862b2f8f authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

perf evsel: Rename *perf_evsel__*set_sample_*() to *evsel__*set_sample_*() 



As they are not 'struct evsel' methods, not part of tools/lib/perf/, aka
libperf, to whom the perf_ prefix belongs.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 347c751a

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

+2 −2
Original line number Diff line number Diff line
@@ -402,7 +402,7 @@ static int cs_etm_recording_options(struct auxtrace_record *itr, 
	 * when a context switch happened.

	 */

	if (!perf_cpu_map__empty(cpus)) {

		perf_evsel__set_sample_bit(cs_etm_evsel, CPU);

		evsel__set_sample_bit(cs_etm_evsel, CPU);



		err = cs_etm_set_option(itr, cs_etm_evsel,

					ETM_OPT_CTXTID | ETM_OPT_TS);
@@ -426,7 +426,7 @@ static int cs_etm_recording_options(struct auxtrace_record *itr, 


		/* In per-cpu case, always need the time of mmap events etc */

		if (!perf_cpu_map__empty(cpus))

			perf_evsel__set_sample_bit(tracking_evsel, TIME);

			evsel__set_sample_bit(tracking_evsel, TIME);

	}



out:

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

+6 −6
Original line number Diff line number Diff line
@@ -120,9 +120,9 @@ static int arm_spe_recording_options(struct auxtrace_record *itr, 
	 */

	perf_evlist__to_front(evlist, arm_spe_evsel);



	perf_evsel__set_sample_bit(arm_spe_evsel, CPU);

	perf_evsel__set_sample_bit(arm_spe_evsel, TIME);

	perf_evsel__set_sample_bit(arm_spe_evsel, TID);

	evsel__set_sample_bit(arm_spe_evsel, CPU);

	evsel__set_sample_bit(arm_spe_evsel, TIME);

	evsel__set_sample_bit(arm_spe_evsel, TID);



	/* Add dummy event to keep tracking */

	err = parse_events(evlist, "dummy:u", NULL);
@@ -134,9 +134,9 @@ static int arm_spe_recording_options(struct auxtrace_record *itr, 


	tracking_evsel->core.attr.freq = 0;

	tracking_evsel->core.attr.sample_period = 1;

	perf_evsel__set_sample_bit(tracking_evsel, TIME);

	perf_evsel__set_sample_bit(tracking_evsel, CPU);

	perf_evsel__reset_sample_bit(tracking_evsel, BRANCH_STACK);

	evsel__set_sample_bit(tracking_evsel, TIME);

	evsel__set_sample_bit(tracking_evsel, CPU);

	evsel__reset_sample_bit(tracking_evsel, BRANCH_STACK);



	return 0;

}

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

+1 −1
Original line number Diff line number Diff line
@@ -224,7 +224,7 @@ static int intel_bts_recording_options(struct auxtrace_record *itr, 
		 * AUX event.

		 */

		if (!perf_cpu_map__empty(cpus))

			perf_evsel__set_sample_bit(intel_bts_evsel, CPU);

			evsel__set_sample_bit(intel_bts_evsel, CPU);

	}



	/* Add dummy event to keep tracking */

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

+10 −10
Original line number Diff line number Diff line
@@ -421,8 +421,8 @@ static int intel_pt_track_switches(struct evlist *evlist) 


	evsel = evlist__last(evlist);



	perf_evsel__set_sample_bit(evsel, CPU);

	perf_evsel__set_sample_bit(evsel, TIME);

	evsel__set_sample_bit(evsel, CPU);

	evsel__set_sample_bit(evsel, TIME);



	evsel->core.system_wide = true;

	evsel->no_aux_samples = true;
@@ -802,10 +802,10 @@ static int intel_pt_recording_options(struct auxtrace_record *itr, 
				switch_evsel->no_aux_samples = true;

				switch_evsel->immediate = true;



				perf_evsel__set_sample_bit(switch_evsel, TID);

				perf_evsel__set_sample_bit(switch_evsel, TIME);

				perf_evsel__set_sample_bit(switch_evsel, CPU);

				perf_evsel__reset_sample_bit(switch_evsel, BRANCH_STACK);

				evsel__set_sample_bit(switch_evsel, TID);

				evsel__set_sample_bit(switch_evsel, TIME);

				evsel__set_sample_bit(switch_evsel, CPU);

				evsel__reset_sample_bit(switch_evsel, BRANCH_STACK);



				opts->record_switch_events = false;

				ptr->have_sched_switch = 3;
@@ -839,7 +839,7 @@ static int intel_pt_recording_options(struct auxtrace_record *itr, 
		 * AUX event.

		 */

		if (!perf_cpu_map__empty(cpus))

			perf_evsel__set_sample_bit(intel_pt_evsel, CPU);

			evsel__set_sample_bit(intel_pt_evsel, CPU);

	}



	/* Add dummy event to keep tracking */
@@ -863,11 +863,11 @@ static int intel_pt_recording_options(struct auxtrace_record *itr, 


		/* In per-cpu case, always need the time of mmap events etc */

		if (!perf_cpu_map__empty(cpus)) {

			perf_evsel__set_sample_bit(tracking_evsel, TIME);

			evsel__set_sample_bit(tracking_evsel, TIME);

			/* And the CPU for switch events */

			perf_evsel__set_sample_bit(tracking_evsel, CPU);

			evsel__set_sample_bit(tracking_evsel, CPU);

		}

		perf_evsel__reset_sample_bit(tracking_evsel, BRANCH_STACK);

		evsel__reset_sample_bit(tracking_evsel, BRANCH_STACK);

	}



	/*

tools/perf/builtin-annotate.c

+1 −1
Original line number Diff line number Diff line
@@ -433,7 +433,7 @@ static int __cmd_annotate(struct perf_annotate *ann) 
			total_nr_samples += nr_samples;

			hists__collapse_resort(hists, NULL);

			/* Don't sort callchain */

			perf_evsel__reset_sample_bit(pos, CALLCHAIN);

			evsel__reset_sample_bit(pos, CALLCHAIN);

			perf_evsel__output_resort(pos, NULL);



			if (symbol_conf.event_group &&