perf stat: Factor out print_counter_value() function

And split it for each output mode like others.  I believe it makes the
code simpler and more intuitive.  Now abs_printout() becomes just to
call sub-functions.

Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Athira Jajeev <atrajeev@linux.vnet.ibm.com>
Cc: Ian Rogers <irogers@google.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: James Clark <james.clark@arm.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Xing Zhengjun <zhengjun.xing@linux.intel.com>
Link: https://lore.kernel.org/r/20221114230227.1255976-7-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/util/stat-display.c b/tools/perf/util/stat-display.c
index ed421f6d512f4afbbc3f0dc5bceb25c43c4a6b7d..a72c7442ff3dd2a15fabc5f8a79734032d2f7517 100644 (file)
--- a/tools/perf/util/stat-display.c
+++ b/tools/perf/util/stat-display.c
@@ -517,46 +517,71 @@ static void print_metric_header(struct perf_stat_config *config,
                fprintf(os->fh, "%*s ", config->metric_only_len, unit);
 }
 
-static void abs_printout(struct perf_stat_config *config,
-                        struct aggr_cpu_id id, int nr, struct evsel *evsel, double avg)
+static void print_counter_value_std(struct perf_stat_config *config,
+                                   struct evsel *evsel, double avg)
 {
        FILE *output = config->output;
        double sc =  evsel->scale;
        const char *fmt;
 
-       if (config->csv_output) {
-               fmt = floor(sc) != sc ?  "%.2f%s" : "%.0f%s";
-       } else {
-               if (config->big_num)
-                       fmt = floor(sc) != sc ? "%'18.2f%s" : "%'18.0f%s";
-               else
-                       fmt = floor(sc) != sc ? "%18.2f%s" : "%18.0f%s";
-       }
+       if (config->big_num)
+               fmt = floor(sc) != sc ? "%'18.2f " : "%'18.0f ";
+       else
+               fmt = floor(sc) != sc ? "%18.2f " : "%18.0f ";
 
-       aggr_printout(config, evsel, id, nr);
+       fprintf(output, fmt, avg);
 
-       if (config->json_output)
-               fprintf(output, "\"counter-value\" : \"%f\", ", avg);
-       else
-               fprintf(output, fmt, avg, config->csv_sep);
+       if (evsel->unit)
+               fprintf(output, "%-*s ", config->unit_width, evsel->unit);
 
-       if (config->json_output) {
-               if (evsel->unit) {
-                       fprintf(output, "\"unit\" : \"%s\", ",
-                               evsel->unit);
-               }
-       } else {
-               if (evsel->unit)
-                       fprintf(output, "%-*s%s",
-                               config->csv_output ? 0 : config->unit_width,
-                               evsel->unit, config->csv_sep);
-       }
+       fprintf(output, "%-*s", 32, evsel__name(evsel));
+}
 
+static void print_counter_value_csv(struct perf_stat_config *config,
+                                   struct evsel *evsel, double avg)
+{
+       FILE *output = config->output;
+       double sc =  evsel->scale;
+       const char *sep = config->csv_sep;
+       const char *fmt = floor(sc) != sc ? "%.2f%s" : "%.0f%s";
+
+       fprintf(output, fmt, avg, sep);
+
+       if (evsel->unit)
+               fprintf(output, "%s%s", evsel->unit, sep);
+
+       fprintf(output, "%s", evsel__name(evsel));
+}
+
+static void print_counter_value_json(struct perf_stat_config *config,
+                                    struct evsel *evsel, double avg)
+{
+       FILE *output = config->output;
+
+       fprintf(output, "\"counter-value\" : \"%f\", ", avg);
+
+       if (evsel->unit)
+               fprintf(output, "\"unit\" : \"%s\", ", evsel->unit);
+
+       fprintf(output, "\"event\" : \"%s\", ", evsel__name(evsel));
+}
+
+static void print_counter_value(struct perf_stat_config *config,
+                               struct evsel *evsel, double avg)
+{
        if (config->json_output)
-               fprintf(output, "\"event\" : \"%s\", ", evsel__name(evsel));
+               print_counter_value_json(config, evsel, avg);
+       else if (config->csv_output)
+               print_counter_value_csv(config, evsel, avg);
        else
-               fprintf(output, "%-*s", config->csv_output ? 0 : 32, evsel__name(evsel));
+               print_counter_value_std(config, evsel, avg);
+}
 
+static void abs_printout(struct perf_stat_config *config,
+                        struct aggr_cpu_id id, int nr, struct evsel *evsel, double avg)
+{
+       aggr_printout(config, evsel, id, nr);
+       print_counter_value(config, evsel, avg);
        print_cgroup(config, evsel);
 }