perf hists browser: Print overhead percent value for first-level callchain

[cascardo/linux.git] / tools / perf / ui / browsers / hists.c

diff --git a/tools/perf/ui/browsers/hists.c b/tools/perf/ui/browsers/hists.c
index cfb976b..8d22905 100644 (file)
--- a/tools/perf/ui/browsers/hists.c
+++ b/tools/perf/ui/browsers/hists.c
@@ -463,23 +463,6 @@ out:
        return key;
 }
 
-static char *callchain_list__sym_name(struct callchain_list *cl,
-                                     char *bf, size_t bfsize, bool show_dso)
-{
-       int printed;
-
-       if (cl->ms.sym)
-               printed = scnprintf(bf, bfsize, "%s", cl->ms.sym->name);
-       else
-               printed = scnprintf(bf, bfsize, "%#" PRIx64, cl->ip);
-
-       if (show_dso)
-               scnprintf(bf + printed, bfsize - printed, " %s",
-                         cl->ms.map ? cl->ms.map->dso->short_name : "unknown");
-
-       return bf;
-}
-
 struct callchain_print_arg {
        /* for hists browser */
        off_t   row_offset;
@@ -559,8 +542,11 @@ static int hist_browser__show_callchain(struct hist_browser *browser,
        struct rb_node *node;
        int first_row = row, offset = level * LEVEL_OFFSET_STEP;
        u64 new_total;
+       bool need_percent;
 
        node = rb_first(root);
+       need_percent = !!rb_next(node);
+
        while (node) {
                struct callchain_node *child = rb_entry(node, struct callchain_node, rb_node);
                struct rb_node *next = rb_next(node);
@@ -577,7 +563,7 @@ static int hist_browser__show_callchain(struct hist_browser *browser,
 
                        if (first)
                                first = false;
-                       else if (level > 1)
+                       else if (need_percent)
                                extra_offset = LEVEL_OFFSET_STEP;
 
                        folded_sign = callchain_list__folded(chain);
@@ -590,7 +576,7 @@ static int hist_browser__show_callchain(struct hist_browser *browser,
                        str = callchain_list__sym_name(chain, bf, sizeof(bf),
                                                       browser->show_dso);
 
-                       if (was_first && level > 1) {
+                       if (was_first && need_percent) {
                                double percent = cumul * 100.0 / total;
 
                                if (asprintf(&alloc_str, "%2.2f%% %s", percent, str) < 0)
@@ -807,6 +793,13 @@ static int hist_browser__show_entry(struct hist_browser *browser,
                        .is_current_entry = current_entry,
                };
 
+               if (callchain_param.mode == CHAIN_GRAPH_REL) {
+                       if (symbol_conf.cumulate_callchain)
+                               total = entry->stat_acc->period;
+                       else
+                               total = entry->stat.period;
+               }
+
                printed += hist_browser__show_callchain(browser,
                                        &entry->sorted_chain, 1, row, total,
                                        hist_browser__show_callchain_entry, &arg,