1 files changed, 28 insertions, 5 deletions

diff --git a/tools/perf/ui/gtk/hists.c b/tools/perf/ui/gtk/hists.c
index 9d90683914d4..6ca60e482cdc 100644
--- a/tools/perf/ui/gtk/hists.c
+++ b/tools/perf/ui/gtk/hists.c
@@ -47,11 +47,26 @@ static int perf_gtk__hpp_color_##_type(struct perf_hpp_fmt *fmt __maybe_unused,
                           __percent_color_snprintf, true);                      \
 }
 
+#define __HPP_COLOR_ACC_PERCENT_FN(_type, _field)                               \
+static u64 he_get_acc_##_field(struct hist_entry *he)                           \
+{                                                                               \
+        return he->stat_acc->_field;                                            \
+}                                                                               \
+                                                                                \
+static int perf_gtk__hpp_color_##_type(struct perf_hpp_fmt *fmt __maybe_unused, \
+                                       struct perf_hpp *hpp,                    \
+                                       struct hist_entry *he)                   \
+{                                                                               \
+        return __hpp__fmt_acc(hpp, he, he_get_acc_##_field, " %6.2f%%",         \
+                              __percent_color_snprintf, true);                  \
+}
+
 __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)
+__HPP_COLOR_ACC_PERCENT_FN(overhead_acc, period)
 
 #undef __HPP_COLOR_PERCENT_FN
 
@@ -68,6 +83,8 @@ void perf_gtk__init_hpp(void)
                                 perf_gtk__hpp_color_overhead_guest_sys;
         perf_hpp__format[PERF_HPP__OVERHEAD_GUEST_US].color =
                                 perf_gtk__hpp_color_overhead_guest_us;
+        perf_hpp__format[PERF_HPP__OVERHEAD_ACC].color =
+                                perf_gtk__hpp_color_overhead_acc;
 }
 
 static void callchain_list__sym_name(struct callchain_list *cl,
@@ -181,6 +198,13 @@ static void perf_gtk__show_hists(GtkWidget *window, struct hists *hists,
                 if (perf_hpp__should_skip(fmt))
                         continue;
 
+                /*
+                 * XXX no way to determine where symcol column is..
+                 *     Just use last column for now.
+                 */
+                if (perf_hpp__is_sort_entry(fmt))
+                        sym_col = col_idx;
+
                 fmt->header(fmt, &hpp, hists_to_evsel(hists));
 
                 gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(view),
@@ -209,14 +233,12 @@ static void perf_gtk__show_hists(GtkWidget *window, struct hists *hists,
                 struct hist_entry *h = rb_entry(nd, struct hist_entry, rb_node);
                 GtkTreeIter iter;
                 u64 total = hists__total_period(h->hists);
-                float percent = 0.0;
+                float percent;
 
                 if (h->filtered)
                         continue;
 
-                if (total)
-                        percent = h->stat.period * 100.0 / total;
-
+                percent = hist_entry__get_percent_limit(h);
                 if (percent < min_pcnt)
                         continue;
 
@@ -238,7 +260,8 @@ static void perf_gtk__show_hists(GtkWidget *window, struct hists *hists,
 
                 if (symbol_conf.use_callchain && sort__has_sym) {
                         if (callchain_param.mode == CHAIN_GRAPH_REL)
-                                total = h->stat.period;
+                                total = symbol_conf.cumulate_callchain ?
+                                        h->stat_acc->period : h->stat.period;
 
                         perf_gtk__add_callchain(&h->sorted_chain, store, &iter,
                                                 sym_col, total);