|
@@ -542,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);
|
|
@@ -560,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);
|
|
@@ -573,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)
|
|
@@ -790,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,
|