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

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

perf evlist: Introduce 'disable' method 

To remove the last case of access to the FD() macro outside the library.

Inspired by a patch by Borislav that moved the FD() macro to util.h, for
namespace concerns I rather preferred to constrain it to ev{sel,list}.c.

Cc: Borislav Petkov <bp@amd64.org>
Cc: David Ahern <dsahern@gmail.com>
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-qn893qsstcg366tkucu649qj@git.kernel.org


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

tools/perf/builtin-record.c

+2 −17
Original line number Diff line number Diff line
@@ -30,8 +30,6 @@ 
#include <sched.h>

#include <sys/mman.h>



#define FD(e, x, y) (*(int *)xyarray__entry(e->fd, x, y))



enum write_mode_t {

	WRITE_FORCE,

	WRITE_APPEND
@@ -438,7 +436,6 @@ static void mmap_read_all(void) 


static int __cmd_record(int argc, const char **argv)

{

	int i;

	struct stat st;

	int flags;

	int err;
@@ -682,7 +679,6 @@ static int __cmd_record(int argc, const char **argv) 


	for (;;) {

		int hits = samples;

		int thread;



		mmap_read_all();
@@ -693,19 +689,8 @@ static int __cmd_record(int argc, const char **argv) 
			waking++;

		}



		if (done) {

			for (i = 0; i < evsel_list->cpus->nr; i++) {

				struct perf_evsel *pos;



				list_for_each_entry(pos, &evsel_list->entries, node) {

					for (thread = 0;

						thread < evsel_list->threads->nr;

						thread++)

						ioctl(FD(pos, i, thread),

							PERF_EVENT_IOC_DISABLE);

				}

			}

		}

		if (done)

			perf_evlist__disable(evsel_list);

	}



	if (quiet || signr == SIGUSR1)

tools/perf/util/evlist.c

+13 −0
Original line number Diff line number Diff line
@@ -91,6 +91,19 @@ int perf_evlist__add_default(struct perf_evlist *evlist) 
	return 0;

}



void perf_evlist__disable(struct perf_evlist *evlist)

{

	int cpu, thread;

	struct perf_evsel *pos;



	for (cpu = 0; cpu < evlist->cpus->nr; cpu++) {

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

			for (thread = 0; thread < evlist->threads->nr; thread++)

				ioctl(FD(pos, cpu, thread), PERF_EVENT_IOC_DISABLE);

		}

	}

}



int perf_evlist__alloc_pollfd(struct perf_evlist *evlist)

{

	int nfds = evlist->cpus->nr * evlist->threads->nr * evlist->nr_entries;

tools/perf/util/evlist.h

+2 −0
Original line number Diff line number Diff line
@@ -53,6 +53,8 @@ int perf_evlist__alloc_mmap(struct perf_evlist *evlist); 
int perf_evlist__mmap(struct perf_evlist *evlist, int pages, bool overwrite);

void perf_evlist__munmap(struct perf_evlist *evlist);



void perf_evlist__disable(struct perf_evlist *evlist);



static inline void perf_evlist__set_maps(struct perf_evlist *evlist,

					 struct cpu_map *cpus,

					 struct thread_map *threads)