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

Commit 04e21314 authored by Adrian Hunter's avatar Adrian Hunter Committed by Arnaldo Carvalho de Melo
Browse files

perf evlist: Factor out duplicated mmap code 



The same code is used in perf_evlist__mmap_per_cpu() and
perf_evlist__mmap_per_thread().

Factor it out into a separate function perf_evlist__mmap_per_evsel().

Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/1382099356-4918-17-git-send-email-adrian.hunter@intel.com


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

tools/perf/util/evlist.c

+36 −37
Original line number Diff line number Diff line
@@ -608,35 +608,48 @@ static int __perf_evlist__mmap(struct perf_evlist *evlist, 
	return 0;

}



static int perf_evlist__mmap_per_cpu(struct perf_evlist *evlist, int prot, int mask)

static int perf_evlist__mmap_per_evsel(struct perf_evlist *evlist, int idx,

				       int prot, int mask, int cpu, int thread,

				       int *output)

{

	struct perf_evsel *evsel;

	int cpu, thread;

	int nr_cpus = cpu_map__nr(evlist->cpus);

	int nr_threads = thread_map__nr(evlist->threads);



	pr_debug2("perf event ring buffer mmapped per cpu\n");

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

		int output = -1;



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

	list_for_each_entry(evsel, &evlist->entries, node) {

		int fd = FD(evsel, cpu, thread);



				if (output == -1) {

					output = fd;

					if (__perf_evlist__mmap(evlist, cpu,

								prot, mask, output) < 0)

						goto out_unmap;

		if (*output == -1) {

			*output = fd;

			if (__perf_evlist__mmap(evlist, idx, prot, mask,

						*output) < 0)

				return -1;

		} else {

					if (ioctl(fd, PERF_EVENT_IOC_SET_OUTPUT, output) != 0)

						goto out_unmap;

			if (ioctl(fd, PERF_EVENT_IOC_SET_OUTPUT, *output) != 0)

				return -1;

		}



		if ((evsel->attr.read_format & PERF_FORMAT_ID) &&

		    perf_evlist__id_add_fd(evlist, evsel, cpu, thread, fd) < 0)

					goto out_unmap;

			return -1;

	}



	return 0;

}



static int perf_evlist__mmap_per_cpu(struct perf_evlist *evlist, int prot,

				     int mask)

{

	int cpu, thread;

	int nr_cpus = cpu_map__nr(evlist->cpus);

	int nr_threads = thread_map__nr(evlist->threads);



	pr_debug2("perf event ring buffer mmapped per cpu\n");

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

		int output = -1;



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

			if (perf_evlist__mmap_per_evsel(evlist, cpu, prot, mask,

							cpu, thread, &output))

				goto out_unmap;

		}

	}
@@ -648,9 +661,9 @@ static int perf_evlist__mmap_per_cpu(struct perf_evlist *evlist, int prot, int m 
	return -1;

}



static int perf_evlist__mmap_per_thread(struct perf_evlist *evlist, int prot, int mask)

static int perf_evlist__mmap_per_thread(struct perf_evlist *evlist, int prot,

					int mask)

{

	struct perf_evsel *evsel;

	int thread;

	int nr_threads = thread_map__nr(evlist->threads);
@@ -658,23 +671,9 @@ static int perf_evlist__mmap_per_thread(struct perf_evlist *evlist, int prot, in 
	for (thread = 0; thread < nr_threads; thread++) {

		int output = -1;



		list_for_each_entry(evsel, &evlist->entries, node) {

			int fd = FD(evsel, 0, thread);



			if (output == -1) {

				output = fd;

				if (__perf_evlist__mmap(evlist, thread,

							prot, mask, output) < 0)

		if (perf_evlist__mmap_per_evsel(evlist, thread, prot, mask, 0,

						thread, &output))

			goto out_unmap;

			} else {

				if (ioctl(fd, PERF_EVENT_IOC_SET_OUTPUT, output) != 0)

					goto out_unmap;

			}



			if ((evsel->attr.read_format & PERF_FORMAT_ID) &&

			    perf_evlist__id_add_fd(evlist, evsel, 0, thread, fd) < 0)

				goto out_unmap;

		}

	}



	return 0;