Factor out event handling loop into dispatch_events() function.
Signed-off-by: Alexey Budankov <alexey.budan...@linux.intel.com> --- tools/perf/builtin-stat.c | 93 ++++++++++++++++++++++++--------------- 1 file changed, 58 insertions(+), 35 deletions(-) diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c index c43ba6080691..ef2682a87491 100644 --- a/tools/perf/builtin-stat.c +++ b/tools/perf/builtin-stat.c @@ -421,6 +421,24 @@ static void process_interval(void) print_counters(&rs, 0, NULL); } +static bool print_interval(unsigned int interval, int *times) +{ + if (interval) { + process_interval(); + if (interval_count && !(--(*times))) + return true; + } + return false; +} + +static bool process_timeout(bool timeout, unsigned int interval, int *times) +{ + if (timeout) + return true; + else + return print_interval(interval, times); +} + static void enable_counters(void) { if (stat_config.initial_delay) @@ -486,6 +504,42 @@ static bool is_target_alive(struct target *_target, return false; } +static int dispatch_events(pid_t pid, struct perf_stat_config *config) +{ + pid_t child = 0; + bool stop = false; + struct timespec time_to_sleep; + int sleep_time, status = 0; + int times = config->times; + + if (config->interval) + sleep_time = config->interval; + else if (config->timeout) + sleep_time = config->timeout; + else + sleep_time = 1000; + + time_to_sleep.tv_sec = sleep_time / MSEC_PER_SEC; + time_to_sleep.tv_nsec = (sleep_time % MSEC_PER_SEC) * NSEC_PER_MSEC; + + do { + if (pid != -1) { + child = waitpid(pid, &status, WNOHANG); + } else { + if (!stop) + stop = !is_target_alive(&target, evsel_list->core.threads); + } + + if (child || stop || done) + break; + + nanosleep(&time_to_sleep, NULL); + stop = process_timeout(config->timeout, config->interval, ×); + } while (1); + + return status; +} + enum counter_recovery { COUNTER_SKIP, COUNTER_RETRY, @@ -544,12 +598,10 @@ static enum counter_recovery stat_handle_error(struct evsel *counter) static int __run_perf_stat(int argc, const char **argv, int run_idx) { int interval = stat_config.interval; - int times = stat_config.times; int timeout = stat_config.timeout; char msg[BUFSIZ]; unsigned long long t0, t1; struct evsel *counter; - struct timespec ts; size_t l; int status = 0; const bool forks = (argc > 0); @@ -558,17 +610,6 @@ static int __run_perf_stat(int argc, const char **argv, int run_idx) int i, cpu; bool second_pass = false; - if (interval) { - ts.tv_sec = interval / USEC_PER_MSEC; - ts.tv_nsec = (interval % USEC_PER_MSEC) * NSEC_PER_MSEC; - } else if (timeout) { - ts.tv_sec = timeout / USEC_PER_MSEC; - ts.tv_nsec = (timeout % USEC_PER_MSEC) * NSEC_PER_MSEC; - } else { - ts.tv_sec = 1; - ts.tv_nsec = 0; - } - if (forks) { if (perf_evlist__prepare_workload(evsel_list, &target, argv, is_pipe, workload_exec_failed_signal) < 0) { @@ -725,16 +766,9 @@ 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 (!waitpid(child_pid, &status, WNOHANG)) { - nanosleep(&ts, NULL); - if (timeout) - break; - process_interval(); - if (interval_count && !(--times)) - break; - } - } + if (interval || timeout) + dispatch_events(child_pid, &stat_config); + if (child_pid != -1) { if (timeout) kill(child_pid, SIGTERM); @@ -751,18 +785,7 @@ static int __run_perf_stat(int argc, const char **argv, int run_idx) psignal(WTERMSIG(status), argv[0]); } else { enable_counters(); - while (!done) { - nanosleep(&ts, NULL); - if (!is_target_alive(&target, evsel_list->core.threads)) - break; - if (timeout) - break; - if (interval) { - process_interval(); - if (interval_count && !(--times)) - break; - } - } + dispatch_events(-1, &stat_config); } disable_counters(); -- 2.24.1