[PATCH 4/7] perf, tools, stat: Move noise/running printing into printout

[Andi Kleen]

From: Andi Kleen <a...@linux.intel.com>

Move the running/noise printing into printout to avoid
duplicated code in the callers.

Signed-off-by: Andi Kleen <a...@linux.intel.com>
---
 tools/perf/builtin-stat.c | 33 +++++++++++----------------------
 1 file changed, 11 insertions(+), 22 deletions(-)

diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c
index 30c2046..0174aca 100644
--- a/tools/perf/builtin-stat.c
+++ b/tools/perf/builtin-stat.c
@@ -584,7 +584,7 @@ static void abs_printout(int id, int nr, struct perf_evsel 
*evsel, double avg)
 }
 
 static void printout(int id, int nr, struct perf_evsel *counter, double uval,
-                    char *prefix)
+                    char *prefix, u64 run, u64 ena, double noise)
 {
        struct outstate os = {
                .fh = stat_config.output,
@@ -609,6 +609,12 @@ static void printout(int id, int nr, struct perf_evsel 
*counter, double uval,
                                pm,
                                nl,
                                &os);
+
+       if (!csv_output) {
+               print_noise(counter, noise);
+               if (run != ena)
+                       fprintf(stat_config.output, "  (%.2f%%)", 100.0 * run / 
ena);
+       }
 }
 
 static void print_aggr(char *prefix)
@@ -665,11 +671,7 @@ static void print_aggr(char *prefix)
                                continue;
                        }
                        uval = val * counter->scale;
-                       printout(id, nr, counter, uval, prefix);
-                       if (!csv_output)
-                               print_noise(counter, 1.0);
-
-                       print_running(run, ena);
+                       printout(id, nr, counter, uval, prefix, run, ena, 1.0);
                        fputc('\n', output);
                }
        }
@@ -696,12 +698,7 @@ static void print_aggr_thread(struct perf_evsel *counter, 
char *prefix)
                        fprintf(output, "%s", prefix);
 
                uval = val * counter->scale;
-               printout(thread, 0, counter, uval, prefix);
-
-               if (!csv_output)
-                       print_noise(counter, 1.0);
-
-               print_running(run, ena);
+               printout(thread, 0, counter, uval, prefix, run, ena, 1.0);
                fputc('\n', output);
        }
 }
@@ -746,11 +743,7 @@ static void print_counter_aggr(struct perf_evsel *counter, 
char *prefix)
        }
 
        uval = avg * counter->scale;
-       printout(-1, 0, counter, uval, prefix);
-
-       print_noise(counter, avg);
-
-       print_running(avg_running, avg_enabled);
+       printout(-1, 0, counter, uval, prefix, avg_running, avg_enabled, avg);
        fprintf(output, "\n");
 }
 
@@ -799,11 +792,7 @@ static void print_counter(struct perf_evsel *counter, char 
*prefix)
                }
 
                uval = val * counter->scale;
-               printout(cpu, 0, counter, uval, prefix);
-
-               if (!csv_output)
-                       print_noise(counter, 1.0);
-               print_running(run, ena);
+               printout(cpu, 0, counter, uval, prefix, run, ena, 1.0);
 
                fputc('\n', output);
        }
-- 
2.4.3

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/