diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2014-09-22 13:39:48 -0400 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2014-09-25 15:46:56 -0400 |
| commit | 46fb3c21d20415dd2693570c33d0ea6eb8745e04 (patch) | |
| tree | c525d62d2f0c0c399d92782add5760dd126a62e4 /tools | |
| parent | 6dcf45ef9877863fb68c065e5ade3cdb6217c504 (diff) | |
perf trace: Filter out POLLHUP'ed file descriptors
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>
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-6qegv786zbf6i8us6t4rxug9@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/perf/builtin-trace.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c index b8fedf3f9921..fe39dc620179 100644 --- a/tools/perf/builtin-trace.c +++ b/tools/perf/builtin-trace.c | |||
| @@ -2044,6 +2044,7 @@ static int trace__run(struct trace *trace, int argc, const char **argv) | |||
| 2044 | int err = -1, i; | 2044 | int err = -1, i; |
| 2045 | unsigned long before; | 2045 | unsigned long before; |
| 2046 | const bool forks = argc > 0; | 2046 | const bool forks = argc > 0; |
| 2047 | bool draining = false; | ||
| 2047 | char sbuf[STRERR_BUFSIZE]; | 2048 | char sbuf[STRERR_BUFSIZE]; |
| 2048 | 2049 | ||
| 2049 | trace->live = true; | 2050 | trace->live = true; |
| @@ -2171,8 +2172,12 @@ next_event: | |||
| 2171 | if (trace->nr_events == before) { | 2172 | if (trace->nr_events == before) { |
| 2172 | int timeout = done ? 100 : -1; | 2173 | int timeout = done ? 100 : -1; |
| 2173 | 2174 | ||
| 2174 | if (perf_evlist__poll(evlist, timeout) > 0) | 2175 | if (!draining && perf_evlist__poll(evlist, timeout) > 0) { |
| 2176 | if (perf_evlist__filter_pollfd(evlist, POLLERR | POLLHUP) == 0) | ||
| 2177 | draining = true; | ||
| 2178 | |||
| 2175 | goto again; | 2179 | goto again; |
| 2180 | } | ||
| 2176 | } else { | 2181 | } else { |
| 2177 | goto again; | 2182 | goto again; |
| 2178 | } | 2183 | } |