Messages in this thread Patch in this message | | | From | Arnaldo Carvalho de Melo <> | Subject | [PATCH 05/10] perf trace: Filter out POLLHUP'ed file descriptors | Date | Wed, 3 Sep 2014 18:59:59 -0300 |
| |
From: Arnaldo Carvalho de Melo <acme@redhat.com>
So that we don't continue polling on vanished file descriptors, i.e. file descriptors for events monitoring threads that exited.
I.e. the following 'trace' command now exits as expected, instead of staying in an eternal loop:
$ sleep 5s & $ trace -p `pidof sleep`
Reported-by: Jiri Olsa <jolsa@redhat.com> Acked-by: Jiri Olsa <jolsa@kernel.org> Cc: Adrian Hunter <adrian.hunter@intel.com> Cc: David Ahern <dsahern@gmail.com> Cc: Don Zickus <dzickus@redhat.com> Cc: Frederic Weisbecker <fweisbec@gmail.com> Cc: Jiri Olsa <jolsa@redhat.com> Cc: Mike Galbraith <efault@gmx.de> Cc: Namhyung Kim <namhyung@kernel.org> 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-fhn2pyf8sqhoiwu42hxq9yq2@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> --- tools/perf/builtin-trace.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c index a9e96ff49c7f..09d4bc44215e 100644 --- a/tools/perf/builtin-trace.c +++ b/tools/perf/builtin-trace.c @@ -2171,7 +2171,8 @@ next_event: if (trace->nr_events == before) { int timeout = done ? 100 : -1; - if (poll(evlist->pollfd, evlist->nr_fds, timeout) > 0) + if (poll(evlist->pollfd, evlist->nr_fds, timeout) > 0 && + perf_evlist__filter_pollfd(evlist, POLLERR | POLLHUP) > 0) goto again; } else { goto again; -- 1.9.3
| |