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

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

perf evlist: Factor perf_evlist__(enable|disable) functions 



Use perf_evsel__(enable|disable) functions in perf_evlist__(enable|disable)
functions in order to centralize ioctl enable/disable calls. This way we
eliminate 2 places calling directly ioctl.

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: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1449133606-14429-4-git-send-email-jolsa@kernel.org


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

tools/perf/util/evlist.c

+8 −24
Original line number Diff line number Diff line
@@ -336,20 +336,12 @@ static int perf_evlist__nr_threads(struct perf_evlist *evlist, 


void perf_evlist__disable(struct perf_evlist *evlist)

{

	int cpu, thread;

	struct perf_evsel *pos;

	int nr_cpus = cpu_map__nr(evlist->cpus);

	int nr_threads;



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

	evlist__for_each(evlist, pos) {

		if (!perf_evsel__is_group_leader(pos) || !pos->fd)

			continue;

			nr_threads = perf_evlist__nr_threads(evlist, pos);

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

				ioctl(FD(pos, cpu, thread),

				      PERF_EVENT_IOC_DISABLE, 0);

		}

		perf_evsel__disable(pos);

	}



	evlist->enabled = false;
@@ -357,20 +349,12 @@ void perf_evlist__disable(struct perf_evlist *evlist) 


void perf_evlist__enable(struct perf_evlist *evlist)

{

	int cpu, thread;

	struct perf_evsel *pos;

	int nr_cpus = cpu_map__nr(evlist->cpus);

	int nr_threads;



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

	evlist__for_each(evlist, pos) {

		if (!perf_evsel__is_group_leader(pos) || !pos->fd)

			continue;

			nr_threads = perf_evlist__nr_threads(evlist, pos);

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

				ioctl(FD(pos, cpu, thread),

				      PERF_EVENT_IOC_ENABLE, 0);

		}

		perf_evsel__enable(pos);

	}



	evlist->enabled = true;