[PATCH v9 09/15] perf stat: factor out event handling loop into dispatch_events()

[Alexey Budankov]

Consolidate event dispatching loops for fork, attach and system
wide monitoring use cases into common dispatch_events() function.

Signed-off-by: Alexey Budankov <alexey.budan...@linux.intel.com>
---
 tools/perf/builtin-stat.c | 42 +++++++++++++++++++++++++--------------
 1 file changed, 27 insertions(+), 15 deletions(-)

diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c
index 3e11f854ffc8..723f1fe27d63 100644
--- a/tools/perf/builtin-stat.c
+++ b/tools/perf/builtin-stat.c
@@ -550,6 +550,30 @@ static bool is_target_alive(struct target *_target,
        return false;
 }
 
+static int dispatch_events(bool forks, int timeout, int interval, int *times, 
struct timespec *ts)
+{
+       bool stop = false;
+       int child_exited = 0, status = 0;
+
+       while (1) {
+               if (forks)
+                       child_exited = waitpid(child_pid, &status, WNOHANG);
+               else
+                       child_exited = !is_target_alive(&target, 
evsel_list->core.threads) ? 1 : 0;
+
+               if (done || stop || child_exited)
+                       break;
+
+               nanosleep(ts, NULL);
+               if (timeout)
+                       stop = true;
+               else
+                       stop = handle_interval(interval, times);
+       }
+
+       return status;
+}
+
 enum counter_recovery {
        COUNTER_SKIP,
        COUNTER_RETRY,
@@ -621,7 +645,6 @@ static int __run_perf_stat(int argc, const char **argv, int 
run_idx)
        struct affinity affinity;
        int i, cpu;
        bool second_pass = false;
-       bool stop = false;
 
        if (interval) {
                ts.tv_sec  = interval / USEC_PER_MSEC;
@@ -790,14 +813,8 @@ static int __run_perf_stat(int argc, const char **argv, 
int run_idx)
                perf_evlist__start_workload(evsel_list);
                enable_counters();
 
-               if (interval || timeout) {
-                       while (!stop && !waitpid(child_pid, &status, WNOHANG)) {
-                               nanosleep(&ts, NULL);
-                               if (timeout)
-                                       break;
-                               stop = handle_interval(interval, &times);
-                       }
-               }
+               if (interval || timeout)
+                       status = dispatch_events(forks, timeout, interval, 
&times, &ts);
                if (child_pid != -1) {
                        if (timeout)
                                kill(child_pid, SIGTERM);
@@ -814,12 +831,7 @@ static int __run_perf_stat(int argc, const char **argv, 
int run_idx)
                        psignal(WTERMSIG(status), argv[0]);
        } else {
                enable_counters();
-               while (!done && !stop && is_target_alive(&target, 
evsel_list->core.threads)) {
-                       nanosleep(&ts, NULL);
-                       if (timeout)
-                               break;
-                       stop = handle_interval(interval, &times);
-               }
+               status = dispatch_events(forks, timeout, interval, &times, &ts);
        }
 
        disable_counters();
-- 
2.24.1