Messages in this thread Patch in this message | | | Subject | [PATCH v7 04/13] perf stat: factor out body of event handling loop for system wide | From | Alexey Budankov <> | Date | Wed, 3 Jun 2020 18:55:38 +0300 |
| |
Introduce process_interval() and process_timeout() functions that factor out body of event handling loop for attach and system wide monitoring use cases.
Signed-off-by: Alexey Budankov <alexey.budankov@linux.intel.com> --- tools/perf/builtin-stat.c | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-)
diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c index 9be020e0098a..31f7ccf9537b 100644 --- a/tools/perf/builtin-stat.c +++ b/tools/perf/builtin-stat.c @@ -475,6 +475,23 @@ 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(int timeout, unsigned int interval, int *times) +{ + if (timeout) + return true; + return print_interval(interval, times); +} + static void enable_counters(void) { if (stat_config.initial_delay) @@ -611,6 +628,7 @@ 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; @@ -805,17 +823,11 @@ static int __run_perf_stat(int argc, const char **argv, int run_idx) psignal(WTERMSIG(status), argv[0]); } else { enable_counters(); - while (!done) { + while (!done && !stop) { 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; - } + stop = process_timeout(timeout, interval, ×); } } -- 2.24.1
| |