Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

perf evlist: Remove perf_evlist__(enable|disable)_event functions 



Replacing them with perf_evsel__(enable|disable).

Signed-off-by: default avatarJiri Olsa <jolsa@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Noel Grandin <noelgrandin@gmail.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1452158050-28061-2-git-send-email-jolsa@kernel.org


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

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -327,7 +327,7 @@ static int intel_bts_snapshot_start(struct auxtrace_record *itr) 




	evlist__for_each(btsr->evlist, evsel) {

	evlist__for_each(btsr->evlist, evsel) {

		if (evsel->attr.type == btsr->intel_bts_pmu->type)

		if (evsel->attr.type == btsr->intel_bts_pmu->type)

			return perf_evlist__disable_event(btsr->evlist, evsel);

			return perf_evsel__disable(evsel);

	}

	}

	return -EINVAL;

	return -EINVAL;

}

}
@@ -340,7 +340,7 @@ static int intel_bts_snapshot_finish(struct auxtrace_record *itr) 




	evlist__for_each(btsr->evlist, evsel) {

	evlist__for_each(btsr->evlist, evsel) {

		if (evsel->attr.type == btsr->intel_bts_pmu->type)

		if (evsel->attr.type == btsr->intel_bts_pmu->type)

			return perf_evlist__enable_event(btsr->evlist, evsel);

			return perf_evsel__enable(evsel);

	}

	}

	return -EINVAL;

	return -EINVAL;

}

}

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -725,7 +725,7 @@ static int intel_pt_snapshot_start(struct auxtrace_record *itr) 




	evlist__for_each(ptr->evlist, evsel) {

	evlist__for_each(ptr->evlist, evsel) {

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

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

			return perf_evlist__disable_event(ptr->evlist, evsel);

			return perf_evsel__disable(evsel);

	}

	}

	return -EINVAL;

	return -EINVAL;

}

}
@@ -738,7 +738,7 @@ static int intel_pt_snapshot_finish(struct auxtrace_record *itr) 




	evlist__for_each(ptr->evlist, evsel) {

	evlist__for_each(ptr->evlist, evsel) {

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

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

			return perf_evlist__enable_event(ptr->evlist, evsel);

			return perf_evsel__enable(evsel);

	}

	}

	return -EINVAL;

	return -EINVAL;

}

}

tools/perf/tests/keep-tracking.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -123,7 +123,7 @@ int test__keep_tracking(int subtest __maybe_unused) 




	evsel = perf_evlist__last(evlist);

	evsel = perf_evlist__last(evlist);





	CHECK__(perf_evlist__disable_event(evlist, evsel));

	CHECK__(perf_evsel__disable(evsel));





	comm = "Test COMM 2";

	comm = "Test COMM 2";

	CHECK__(prctl(PR_SET_NAME, (unsigned long)comm, 0, 0, 0));

	CHECK__(prctl(PR_SET_NAME, (unsigned long)comm, 0, 0, 0));

tools/perf/tests/switch-tracking.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -455,7 +455,7 @@ int test__switch_tracking(int subtest __maybe_unused) 




	perf_evlist__enable(evlist);

	perf_evlist__enable(evlist);





	err = perf_evlist__disable_event(evlist, cpu_clocks_evsel);

	err = perf_evsel__disable(cpu_clocks_evsel);

	if (err) {

	if (err) {

		pr_debug("perf_evlist__disable_event failed!\n");

		pr_debug("perf_evlist__disable_event failed!\n");

		goto out_err;

		goto out_err;
@@ -474,7 +474,7 @@ int test__switch_tracking(int subtest __maybe_unused) 
		goto out_err;

		goto out_err;

	}

	}





	err = perf_evlist__disable_event(evlist, cycles_evsel);

	err = perf_evsel__disable(cycles_evsel);

	if (err) {

	if (err) {

		pr_debug("perf_evlist__disable_event failed!\n");

		pr_debug("perf_evlist__disable_event failed!\n");

		goto out_err;

		goto out_err;
@@ -500,7 +500,7 @@ int test__switch_tracking(int subtest __maybe_unused) 
		goto out_err;

		goto out_err;

	}

	}





	err = perf_evlist__enable_event(evlist, cycles_evsel);

	err = perf_evsel__enable(cycles_evsel);

	if (err) {

	if (err) {

		pr_debug("perf_evlist__disable_event failed!\n");

		pr_debug("perf_evlist__disable_event failed!\n");

		goto out_err;

		goto out_err;

tools/perf/util/evlist.c

+0 −42
Original line number Original line Diff line number Diff line
@@ -393,48 +393,6 @@ void perf_evlist__toggle_enable(struct perf_evlist *evlist) 
	(evlist->enabled ? perf_evlist__disable : perf_evlist__enable)(evlist);

	(evlist->enabled ? perf_evlist__disable : perf_evlist__enable)(evlist);

}

}





int perf_evlist__disable_event(struct perf_evlist *evlist,

			       struct perf_evsel *evsel)

{

	int cpu, thread, err;

	int nr_cpus = cpu_map__nr(evlist->cpus);

	int nr_threads = perf_evlist__nr_threads(evlist, evsel);



	if (!evsel->fd)

		return 0;



	for (cpu = 0; cpu < nr_cpus; cpu++) {

		for (thread = 0; thread < nr_threads; thread++) {

			err = ioctl(FD(evsel, cpu, thread),

				    PERF_EVENT_IOC_DISABLE, 0);

			if (err)

				return err;

		}

	}

	return 0;

}



int perf_evlist__enable_event(struct perf_evlist *evlist,

			      struct perf_evsel *evsel)

{

	int cpu, thread, err;

	int nr_cpus = cpu_map__nr(evlist->cpus);

	int nr_threads = perf_evlist__nr_threads(evlist, evsel);



	if (!evsel->fd)

		return -EINVAL;



	for (cpu = 0; cpu < nr_cpus; cpu++) {

		for (thread = 0; thread < nr_threads; thread++) {

			err = ioctl(FD(evsel, cpu, thread),

				    PERF_EVENT_IOC_ENABLE, 0);

			if (err)

				return err;

		}

	}

	return 0;

}



static int perf_evlist__enable_event_cpu(struct perf_evlist *evlist,

static int perf_evlist__enable_event_cpu(struct perf_evlist *evlist,

					 struct perf_evsel *evsel, int cpu)

					 struct perf_evsel *evsel, int cpu)

{

{