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

libperf: Add perf_evlist__add_pollfd() function 



Move perf_evlist__add_pollfd() from tools/perf to libperf, it will be
used in the following patches.

Also rename perf's perf_evlist__add_pollfd()/perf_evlist__filter_pollfd()
to evlist__add_pollfd()/evlist__filter_pollfd().

Signed-off-by: default avatarJiri Olsa <jolsa@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Michael Petlan <mpetlan@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lore.kernel.org/lkml/20190913132355.21634-38-jolsa@kernel.org


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

tools/perf/builtin-kvm.c

+2 −2
Original line number Diff line number Diff line
@@ -967,10 +967,10 @@ static int kvm_events_live_report(struct perf_kvm_stat *kvm) 
		goto out;

	}



	if (perf_evlist__add_pollfd(kvm->evlist, kvm->timerfd) < 0)

	if (evlist__add_pollfd(kvm->evlist, kvm->timerfd) < 0)

		goto out;



	nr_stdin = perf_evlist__add_pollfd(kvm->evlist, fileno(stdin));

	nr_stdin = evlist__add_pollfd(kvm->evlist, fileno(stdin));

	if (nr_stdin < 0)

		goto out;

tools/perf/builtin-record.c

+1 −1
Original line number Diff line number Diff line
@@ -1624,7 +1624,7 @@ static int __cmd_record(struct record *rec, int argc, const char **argv) 
				err = 0;

			waking++;



			if (perf_evlist__filter_pollfd(rec->evlist, POLLERR | POLLHUP) == 0)

			if (evlist__filter_pollfd(rec->evlist, POLLERR | POLLHUP) == 0)

				draining = true;

		}

tools/perf/builtin-trace.c

+1 −1
Original line number Diff line number Diff line
@@ -3475,7 +3475,7 @@ again: 
		int timeout = done ? 100 : -1;



		if (!draining && perf_evlist__poll(evlist, timeout) > 0) {

			if (perf_evlist__filter_pollfd(evlist, POLLERR | POLLHUP | POLLNVAL) == 0)

			if (evlist__filter_pollfd(evlist, POLLERR | POLLHUP | POLLNVAL) == 0)

				draining = true;



			goto again;

tools/perf/lib/evlist.c

+16 −0
Original line number Diff line number Diff line
@@ -12,6 +12,9 @@ 
#include <stdlib.h>

#include <errno.h>

#include <unistd.h>

#include <fcntl.h>

#include <signal.h>

#include <poll.h>

#include <perf/cpumap.h>

#include <perf/threadmap.h>

#include <api/fd/array.h>
@@ -260,3 +263,16 @@ int perf_evlist__alloc_pollfd(struct perf_evlist *evlist) 


	return 0;

}



int perf_evlist__add_pollfd(struct perf_evlist *evlist, int fd,

			    void *ptr, short revent)

{

	int pos = fdarray__add(&evlist->pollfd, fd, revent | POLLERR | POLLHUP);



	if (pos >= 0) {

		evlist->pollfd.priv[pos].ptr = ptr;

		fcntl(fd, F_SETFL, O_NONBLOCK);

	}



	return pos;

}

tools/perf/lib/include/internal/evlist.h

+2 −0
Original line number Diff line number Diff line
@@ -25,6 +25,8 @@ struct perf_evlist { 
};



int perf_evlist__alloc_pollfd(struct perf_evlist *evlist);

int perf_evlist__add_pollfd(struct perf_evlist *evlist, int fd,

			    void *ptr, short revent);



/**

 * __perf_evlist__for_each_entry - iterate thru all the evsels

CRA Git | Maintained and supported by SUSTech CRA and CCSE