perf stat: Factor out body of event handling loop for system wide

Introduce handle_interval() function that factors out body of event
handling loop for attach and system wide monitoring use cases.

Signed-off-by: Alexey Budankov <alexey.budankov@linux.intel.com>
Acked-by: Jiri Olsa <jolsa@redhat.com>
Acked-by: Namhyung Kim <namhyung@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lore.kernel.org/lkml/73130f9e-0d0f-7391-da50-41b4bf4bf54d@linux.intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c
index 922d996..80aea49 100644 (file)
--- a/tools/perf/builtin-stat.c
+++ b/tools/perf/builtin-stat.c
@@ -475,6 +475,16 @@ static void process_interval(void)
        print_counters(&rs, 0, NULL);
 }
 
+static bool handle_interval(unsigned int interval, int *times)
+{
+       if (interval) {
+               process_interval();
+               if (interval_count && !(--(*times)))
+                       return true;
+       }
+       return false;
+}
+
 static void enable_counters(void)
 {
        if (stat_config.initial_delay)
@@ -809,13 +819,8 @@ try_again_reset:
                        nanosleep(&ts, NULL);
                        if (!is_target_alive(&target, evsel_list->core.threads))
                                break;
-                       if (timeout)
+                       if (timeout || handle_interval(interval, &times))
                                break;
-                       if (interval) {
-                               process_interval();
-                               if (interval_count && !(--times))
-                                       break;
-                       }
                }
        }