Skip to contentSkip to conversation

perf evlist: Monitor POLLERR and POLLHUP events too

tip:perf/core tip-bot for Arnaldo Carvalho de Melo 1 participant 1 message Sep 26, 2014 perf events

lore
Share & tools
lore
#0 lore raw
Commit-ID:  8179672c2f7b9c41a7ef3e8c907d214fa92ed614
Gitweb:     http://git.kernel.org/tip/8179672c2f7b9c41a7ef3e8c907d214fa92ed614
Author:     Arnaldo Carvalho de Melo <[email protected]>
AuthorDate: Wed, 13 Aug 2014 11:26:21 -0300
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Thu, 25 Sep 2014 16:46:54 -0300

perf evlist: Monitor POLLERR and POLLHUP events too

We want to know when the fd went away, like when a monitored thread exits.

If we do not monitor such events, then the tools will wait forever on events from a vanished thread, like when running:

 $ sleep 5s &
 $ perf record -p `pidof sleep`

This builds upon the kernel patch by Jiri Olsa that actually makes a poll on those file descriptors to return POLLHUP.

It is also needed to change the tools to use perf_evlist__filter_pollfd() to check if there are remainings fds to monitor or if all are gone, in which case they will exit the poll/mmap/read loop.

Cc Adrian Hunter <[email protected]>
Cc David Ahern <[email protected]>
Cc Don Zickus <[email protected]>
Cc Frederic Weisbecker <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Mike Galbraith <[email protected]>
Cc Namhyung Kim <[email protected]>
Cc Paul Mackerras <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Stephane Eranian <[email protected]>
---
 tools/perf/util/evlist.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/util/evlist.c +1 -1
index 023bc38..502cd11 100644
@@ -424,7 +424,7 @@ void perf_evlist__add_pollfd(struct perf_evlist *evlist, int fd)
 {
 	fcntl(fd, F_SETFL, O_NONBLOCK);
 	evlist->pollfd[evlist->nr_fds].fd = fd;
-	evlist->pollfd[evlist->nr_fds].events = POLLIN;
+	evlist->pollfd[evlist->nr_fds].events = POLLIN | POLLERR | POLLHUP;
 	evlist->nr_fds++;
 }