1 files changed, 32 insertions, 14 deletions

diff --git a/tools/perf/ui/browsers/hists.c b/tools/perf/ui/browsers/hists.c
index 57b82c26cd05..46242deee8d2 100644
--- a/tools/perf/ui/browsers/hists.c
+++ b/tools/perf/ui/browsers/hists.c
@@ -567,23 +567,41 @@ static int hist_browser__show_callchain(struct hist_browser *browser,
         return row - first_row;
 }
 
-#define HPP__COLOR_FN(_name, _field)                                    \
-static int hist_browser__hpp_color_ ## _name(struct perf_hpp *hpp,      \
-                                             struct hist_entry *he)     \
+static int __hpp__color_fmt(struct perf_hpp *hpp, struct hist_entry *he,
+                            u64 (*get_field)(struct hist_entry *))
+{
+        int ret;
+        double percent = 0.0;
+        struct hists *hists = he->hists;
+
+        if (hists->stats.total_period)
+                percent = 100.0 * get_field(he) / hists->stats.total_period;
+
+        *(double *)hpp->ptr = percent;
+
+        ret = scnprintf(hpp->buf, hpp->size, "%6.2f%%", percent);
+        return ret;
+}
+
+#define __HPP_COLOR_PERCENT_FN(_type, _field)                           \
+static u64 __hpp_get_##_field(struct hist_entry *he)                    \
+{                                                                       \
+        return he->stat._field;                                         \
+}                                                                       \
+                                                                        \
+static int hist_browser__hpp_color_##_type(struct perf_hpp *hpp,        \
+                                           struct hist_entry *he)       \
 {                                                                       \
-        struct hists *hists = he->hists;                                \
-        double percent = 100.0 * he->stat._field / hists->stats.total_period; \
-        *(double *)hpp->ptr = percent;                                  \
-        return scnprintf(hpp->buf, hpp->size, "%6.2f%%", percent);      \
+        return __hpp__color_fmt(hpp, he, __hpp_get_##_field);           \
 }
 
-HPP__COLOR_FN(overhead, period)
-HPP__COLOR_FN(overhead_sys, period_sys)
-HPP__COLOR_FN(overhead_us, period_us)
-HPP__COLOR_FN(overhead_guest_sys, period_guest_sys)
-HPP__COLOR_FN(overhead_guest_us, period_guest_us)
+__HPP_COLOR_PERCENT_FN(overhead, period)
+__HPP_COLOR_PERCENT_FN(overhead_sys, period_sys)
+__HPP_COLOR_PERCENT_FN(overhead_us, period_us)
+__HPP_COLOR_PERCENT_FN(overhead_guest_sys, period_guest_sys)
+__HPP_COLOR_PERCENT_FN(overhead_guest_us, period_guest_us)
 
-#undef HPP__COLOR_FN
+#undef __HPP_COLOR_PERCENT_FN
 
 void hist_browser__init_hpp(void)
 {
@@ -646,7 +664,7 @@ static int hist_browser__show_entry(struct hist_browser *browser,
 
                         if (fmt->color) {
                                 hpp.ptr = &percent;
-                                /* It will set percent for us. See HPP__COLOR_FN above. */
+                                /* It will set percent for us. See __hpp__color_fmt above. */
                                 width -= fmt->color(&hpp, entry);
 
                                 ui_browser__set_percent_color(&browser->b, percent, current_entry);