Adding record command support to see when all events are down and forcing it to stop in that case.
Like following record session will stop if the monitored pid (1234) exits: $ perf record -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-record.c | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c index ca0251e8470d..dfcc470a9b4a 100644 --- a/tools/perf/builtin-record.c +++ b/tools/perf/builtin-record.c @@ -25,6 +25,7 @@ #include "util/cpumap.h" #include "util/thread_map.h" #include "util/data.h" +#include "util/poller.h" #include <unistd.h> #include <sched.h> @@ -157,6 +158,13 @@ try_again: ui__error("%s\n", msg); goto out; } + + if (perf_evsel__set_poller(pos, &evlist->poller)) { + error("failed to set poller with %d (%s)\n", errno, + strerror(errno)); + rc = -1; + goto out; + } } if (perf_evlist__apply_filters(evlist)) { @@ -296,6 +304,18 @@ static void workload_exec_failed_signal(int signo __maybe_unused, child_finished = 1; } +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_record(struct record *rec, int argc, const char **argv) { int err; @@ -308,6 +328,11 @@ static int __cmd_record(struct record *rec, int argc, const char **argv) struct perf_data_file *file = &rec->file; struct perf_session *session; bool disabled = false; + struct poller *poller = &rec->evlist->poller; + struct poller_ops poller_ops = { + .error = data_error, + .hup = data_error, + }; rec->progname = argv[0]; @@ -447,6 +472,8 @@ static int __cmd_record(struct record *rec, int argc, const char **argv) perf_evlist__enable(rec->evlist); } + poller__set_ops(poller, &poller_ops); + for (;;) { int hits = rec->samples; @@ -458,7 +485,7 @@ static int __cmd_record(struct record *rec, int argc, const char **argv) if (hits == rec->samples) { if (done) break; - err = poll(rec->evlist->pollfd, rec->evlist->nr_fds, -1); + err = poller__poll(poller, -1); /* * Propagate error, only if there's any. Ignore positive * number of returned events and interrupt error. -- 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/
