perf diff: Move diff related columns into diff command

Moving diff related columns into diff command, because they are not used
by any other command.

Also moving the column entry functions under generic one with baseline
as an exception.

Signed-off-by: Jiri Olsa <jolsa@redhat.com>
Reviewed-by: Namhyung Kim <namhyung@kernel.org>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/n/tip-v58qfl75xkqojz54h1v5fy6p@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

1 files changed, 1 insertions, 208 deletions

diff --git a/tools/perf/ui/hist.c b/tools/perf/ui/hist.c
index a359b75ce800..dc900d7a190e 100644
--- a/tools/perf/ui/hist.c
+++ b/tools/perf/ui/hist.c
@@ -163,207 +163,6 @@ HPP_PERCENT_FNS(overhead_guest_us, "guest usr", period_guest_us, 9, 8)
 HPP_RAW_FNS(samples, "Samples", nr_events, 12, 12)
 HPP_RAW_FNS(period, "Period", period, 12, 12)
 
-
-static int hpp__header_baseline(struct perf_hpp_fmt *fmt __maybe_unused,
-                                struct perf_hpp *hpp)
-{
-        return scnprintf(hpp->buf, hpp->size, "Baseline");
-}
-
-static int hpp__width_baseline(struct perf_hpp_fmt *fmt __maybe_unused,
-                               struct perf_hpp *hpp __maybe_unused)
-{
-        return 8;
-}
-
-static double baseline_percent(struct hist_entry *he)
-{
-        struct hists *hists = he->hists;
-        return 100.0 * he->stat.period / hists->stats.total_period;
-}
-
-static int hpp__color_baseline(struct perf_hpp_fmt *fmt __maybe_unused,
-                               struct perf_hpp *hpp, struct hist_entry *he)
-{
-        double percent = baseline_percent(he);
-
-        if (!he->dummy)
-                return percent_color_snprintf(hpp->buf, hpp->size,
-                                              " %6.2f%%", percent);
-        else
-                return scnprintf(hpp->buf, hpp->size, "        ");
-}
-
-static int hpp__entry_baseline(struct perf_hpp_fmt *_fmt __maybe_unused,
-                               struct perf_hpp *hpp, struct hist_entry *he)
-{
-        double percent = baseline_percent(he);
-        const char *fmt = symbol_conf.field_sep ? "%.2f" : " %6.2f%%";
-
-        if (!he->dummy)
-                return scnprintf(hpp->buf, hpp->size, fmt, percent);
-        else
-                return scnprintf(hpp->buf, hpp->size, "            ");
-}
-
-static int hpp__header_period_baseline(struct perf_hpp_fmt *_fmt __maybe_unused,
-                                       struct perf_hpp *hpp)
-{
-        const char *fmt = symbol_conf.field_sep ? "%s" : "%12s";
-
-        return scnprintf(hpp->buf, hpp->size, fmt, "Period Base");
-}
-
-static int hpp__width_period_baseline(struct perf_hpp_fmt *fmt __maybe_unused,
-                                      struct perf_hpp *hpp __maybe_unused)
-{
-        return 12;
-}
-
-static int hpp__entry_period_baseline(struct perf_hpp_fmt *_fmt __maybe_unused,
-                                      struct perf_hpp *hpp, struct hist_entry *he)
-{
-        struct hist_entry *pair = hist_entry__next_pair(he);
-        u64 period = pair ? pair->stat.period : 0;
-        const char *fmt = symbol_conf.field_sep ? "%" PRIu64 : "%12" PRIu64;
-
-        return scnprintf(hpp->buf, hpp->size, fmt, period);
-}
-
-static int hpp__header_delta(struct perf_hpp_fmt *_fmt __maybe_unused,
-                             struct perf_hpp *hpp)
-{
-        const char *fmt = symbol_conf.field_sep ? "%s" : "%7s";
-
-        return scnprintf(hpp->buf, hpp->size, fmt, "Delta");
-}
-
-static int hpp__width_delta(struct perf_hpp_fmt *fmt __maybe_unused,
-                            struct perf_hpp *hpp __maybe_unused)
-{
-        return 7;
-}
-
-static int hpp__entry_delta(struct perf_hpp_fmt *_fmt __maybe_unused,
-                            struct perf_hpp *hpp, struct hist_entry *he)
-{
-        struct hist_entry *pair = hist_entry__next_pair(he);
-        const char *fmt = symbol_conf.field_sep ? "%s" : "%7.7s";
-        char buf[32] = " ";
-        double diff = 0.0;
-
-        if (pair) {
-                if (he->diff.computed)
-                        diff = he->diff.period_ratio_delta;
-                else
-                        diff = perf_diff__compute_delta(he, pair);
-        }
-
-        if (fabs(diff) >= 0.01)
-                scnprintf(buf, sizeof(buf), "%+4.2F%%", diff);
-
-        return scnprintf(hpp->buf, hpp->size, fmt, buf);
-}
-
-static int hpp__header_ratio(struct perf_hpp_fmt *_fmt __maybe_unused,
-                             struct perf_hpp *hpp)
-{
-        const char *fmt = symbol_conf.field_sep ? "%s" : "%14s";
-
-        return scnprintf(hpp->buf, hpp->size, fmt, "Ratio");
-}
-
-static int hpp__width_ratio(struct perf_hpp_fmt *fmt __maybe_unused,
-                            struct perf_hpp *hpp __maybe_unused)
-{
-        return 14;
-}
-
-static int hpp__entry_ratio(struct perf_hpp_fmt *_fmt __maybe_unused,
-                            struct perf_hpp *hpp, struct hist_entry *he)
-{
-        struct hist_entry *pair = hist_entry__next_pair(he);
-        const char *fmt = symbol_conf.field_sep ? "%s" : "%14s";
-        char buf[32] = " ";
-        double ratio = 0.0;
-
-        /* No point for ratio number if we are dummy.. */
-        if (!he->dummy && pair) {
-                if (he->diff.computed)
-                        ratio = he->diff.period_ratio;
-                else
-                        ratio = perf_diff__compute_ratio(he, pair);
-        }
-
-        if (ratio > 0.0)
-                scnprintf(buf, sizeof(buf), "%+14.6F", ratio);
-
-        return scnprintf(hpp->buf, hpp->size, fmt, buf);
-}
-
-static int hpp__header_wdiff(struct perf_hpp_fmt *_fmt __maybe_unused,
-                             struct perf_hpp *hpp)
-{
-        const char *fmt = symbol_conf.field_sep ? "%s" : "%14s";
-
-        return scnprintf(hpp->buf, hpp->size, fmt, "Weighted diff");
-}
-
-static int hpp__width_wdiff(struct perf_hpp_fmt *fmt __maybe_unused,
-                            struct perf_hpp *hpp __maybe_unused)
-{
-        return 14;
-}
-
-static int hpp__entry_wdiff(struct perf_hpp_fmt *_fmt __maybe_unused,
-                            struct perf_hpp *hpp, struct hist_entry *he)
-{
-        struct hist_entry *pair = hist_entry__next_pair(he);
-        const char *fmt = symbol_conf.field_sep ? "%s" : "%14s";
-        char buf[32] = " ";
-        s64 wdiff = 0;
-
-        /* No point for wdiff number if we are dummy.. */
-        if (!he->dummy && pair) {
-                if (he->diff.computed)
-                        wdiff = he->diff.wdiff;
-                else
-                        wdiff = perf_diff__compute_wdiff(he, pair);
-        }
-
-        if (wdiff != 0)
-                scnprintf(buf, sizeof(buf), "%14ld", wdiff);
-
-        return scnprintf(hpp->buf, hpp->size, fmt, buf);
-}
-
-static int hpp__header_formula(struct perf_hpp_fmt *_fmt __maybe_unused,
-                               struct perf_hpp *hpp)
-{
-        const char *fmt = symbol_conf.field_sep ? "%s" : "%70s";
-
-        return scnprintf(hpp->buf, hpp->size, fmt, "Formula");
-}
-
-static int hpp__width_formula(struct perf_hpp_fmt *fmt __maybe_unused,
-                              struct perf_hpp *hpp __maybe_unused)
-{
-        return 70;
-}
-
-static int hpp__entry_formula(struct perf_hpp_fmt *_fmt __maybe_unused,
-                              struct perf_hpp *hpp, struct hist_entry *he)
-{
-        struct hist_entry *pair = hist_entry__next_pair(he);
-        const char *fmt = symbol_conf.field_sep ? "%s" : "%-70s";
-        char buf[96] = " ";
-
-        if (pair)
-                perf_diff__formula(he, pair, buf, sizeof(buf));
-
-        return scnprintf(hpp->buf, hpp->size, fmt, buf);
-}
-
 #define HPP__COLOR_PRINT_FNS(_name)                     \
         {                                               \
                 .header = hpp__header_ ## _name,        \
@@ -380,19 +179,13 @@ static int hpp__entry_formula(struct perf_hpp_fmt *_fmt __maybe_unused,
         }
 
 struct perf_hpp_fmt perf_hpp__format[] = {
-        HPP__COLOR_PRINT_FNS(baseline),
         HPP__COLOR_PRINT_FNS(overhead),
         HPP__COLOR_PRINT_FNS(overhead_sys),
         HPP__COLOR_PRINT_FNS(overhead_us),
         HPP__COLOR_PRINT_FNS(overhead_guest_sys),
         HPP__COLOR_PRINT_FNS(overhead_guest_us),
         HPP__PRINT_FNS(samples),
-        HPP__PRINT_FNS(period),
-        HPP__PRINT_FNS(period_baseline),
-        HPP__PRINT_FNS(delta),
-        HPP__PRINT_FNS(ratio),
-        HPP__PRINT_FNS(wdiff),
-        HPP__PRINT_FNS(formula)
+        HPP__PRINT_FNS(period)
 };
 
 LIST_HEAD(perf_hpp__list);