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

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

perf evlist: Remove dependency on debug routines 

So far we avoided having to link debug.o in the python binding, keep it
that way by not using ui__warning() in evlist.c.

Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-4wtew8hd3g7ejnlehtspys2t@git.kernel.org


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

tools/perf/util/evlist.c

+4 −9
Original line number Original line Diff line number Diff line
@@ -12,7 +12,6 @@ 
#include "evlist.h"

#include "evlist.h"

#include "evsel.h"

#include "evsel.h"

#include "util.h"

#include "util.h"

#include "debug.h"





#include <sys/mman.h>

#include <sys/mman.h>
@@ -257,19 +256,15 @@ int perf_evlist__alloc_mmap(struct perf_evlist *evlist) 
	return evlist->mmap != NULL ? 0 : -ENOMEM;

	return evlist->mmap != NULL ? 0 : -ENOMEM;

}

}





static int __perf_evlist__mmap(struct perf_evlist *evlist, struct perf_evsel *evsel,

static int __perf_evlist__mmap(struct perf_evlist *evlist,

			       int idx, int prot, int mask, int fd)

			       int idx, int prot, int mask, int fd)

{

{

	evlist->mmap[idx].prev = 0;

	evlist->mmap[idx].prev = 0;

	evlist->mmap[idx].mask = mask;

	evlist->mmap[idx].mask = mask;

	evlist->mmap[idx].base = mmap(NULL, evlist->mmap_len, prot,

	evlist->mmap[idx].base = mmap(NULL, evlist->mmap_len, prot,

				      MAP_SHARED, fd, 0);

				      MAP_SHARED, fd, 0);

	if (evlist->mmap[idx].base == MAP_FAILED) {

	if (evlist->mmap[idx].base == MAP_FAILED)

		if (evlist->cpus->map[idx] == -1 && evsel->attr.inherit)

			ui__warning("Inherit is not allowed on per-task "

				    "events using mmap.\n");

		return -1;

		return -1;

	}





	perf_evlist__add_pollfd(evlist, fd);

	perf_evlist__add_pollfd(evlist, fd);

	return 0;

	return 0;
@@ -289,7 +284,7 @@ static int perf_evlist__mmap_per_cpu(struct perf_evlist *evlist, int prot, int m 




				if (output == -1) {

				if (output == -1) {

					output = fd;

					output = fd;

					if (__perf_evlist__mmap(evlist, evsel, cpu,

					if (__perf_evlist__mmap(evlist, cpu,

								prot, mask, output) < 0)

								prot, mask, output) < 0)

						goto out_unmap;

						goto out_unmap;

				} else {

				} else {
@@ -329,7 +324,7 @@ static int perf_evlist__mmap_per_thread(struct perf_evlist *evlist, int prot, in 




			if (output == -1) {

			if (output == -1) {

				output = fd;

				output = fd;

				if (__perf_evlist__mmap(evlist, evsel, thread,

				if (__perf_evlist__mmap(evlist, thread,

							prot, mask, output) < 0)

							prot, mask, output) < 0)

					goto out_unmap;

					goto out_unmap;

			} else {

			} else {