Adding top command support to see when all events are down and forcing it to stop in that case.
Like following top session will stop if the monitored pid (1234) exits: $ perf top -p 1234 Cc: Adrian Hunter <[email protected]> Cc: Arnaldo Carvalho de Melo <[email protected]> Cc: Corey Ashford <[email protected]> Cc: David Ahern <[email protected]> Cc: Frederic Weisbecker <[email protected]> Cc: Ingo Molnar <[email protected]> Cc: Jean Pihet <[email protected]> Cc: Namhyung Kim <[email protected]> Cc: Paul Mackerras <[email protected]> Cc: Peter Zijlstra <[email protected]> Signed-off-by: Jiri Olsa <[email protected]> --- tools/perf/builtin-top.c | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c index 4cd56c9ddedc..d0eeeb7ca5ff 100644 --- a/tools/perf/builtin-top.c +++ b/tools/perf/builtin-top.c @@ -40,6 +40,7 @@ #include "util/xyarray.h" #include "util/sort.h" #include "util/intlist.h" +#include "util/poller.h" #include "arch/common.h" #include "util/debug.h" @@ -875,6 +876,12 @@ try_again: ui__error("%s\n", msg); goto out_err; } + + if (perf_evsel__set_poller(counter, &evlist->poller)) { + error("failed to set poller with %d (%s)\n", errno, + strerror(errno)); + goto out_err; + } } if (perf_evlist__mmap(evlist, opts->mmap_pages, false) < 0) { @@ -906,11 +913,28 @@ static int perf_top__setup_sample_type(struct perf_top *top __maybe_unused) return 0; } +static int data_error(struct poller *p, struct poller_item *item) +{ + pr_debug("got HUP/ERROR on fd %d\n", item->fd); + + poller__del(p, item); + if (poller__empty(p)) { + pr_debug("All events closed shutting down.\n"); + done = 1; + } + return 0; +} + static int __cmd_top(struct perf_top *top) { struct record_opts *opts = &top->record_opts; pthread_t thread; int ret; + struct poller *poller = &top->evlist->poller; + struct poller_ops poller_ops = { + .error = data_error, + .hup = data_error, + }; top->session = perf_session__new(NULL, false, NULL); if (top->session == NULL) @@ -948,8 +972,10 @@ static int __cmd_top(struct perf_top *top) if (!target__none(&opts->target)) perf_evlist__enable(top->evlist); + poller__set_ops(poller, &poller_ops); + /* Wait for a minimal set of events before starting the snapshot */ - poll(top->evlist->pollfd, top->evlist->nr_fds, 100); + poller__poll(poller, 100); perf_top__mmap_read(top); @@ -976,7 +1002,7 @@ static int __cmd_top(struct perf_top *top) perf_top__mmap_read(top); if (hits == top->samples) - ret = poll(top->evlist->pollfd, top->evlist->nr_fds, 100); + ret = poller__poll(poller, 100); } ret = 0; -- 1.8.3.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
