perf tools: Collapse first level callchain entry if it has sibling
If first level callchain has more than single path like when -g caller option is given, it should show only first one in the path and hide others. But it didn't do it properly and just hindered the output. Before: - 80.33% 11.11% abc2 abc2 [.] main + 86.18% main 13.82% __libc_start_main main After: - 80.33% 11.11% abc2 abc2 [.] main + 86.18% main + 13.82% __libc_start_main Signed-off-by: Namhyung Kim <namhyung@kernel.org> Cc: Andi Kleen <andi@firstfloor.org> Cc: David Ahern <dsahern@gmail.com> Cc: Frederic Weisbecker <fweisbec@gmail.com> Cc: Ingo Molnar <mingo@kernel.org> Cc: Jiri Olsa <jolsa@redhat.com> Cc: Namhyung Kim <namhyung.kim@lge.com> Cc: Paul Mackerras <paulus@samba.org> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Link: http://lkml.kernel.org/r/1416816807-6495-2-git-send-email-namhyung@kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
parent
4087d11cd9
commit
a7444af69b
|
@ -227,10 +227,14 @@ static void callchain_node__init_have_children_rb_tree(struct callchain_node *no
|
|||
}
|
||||
}
|
||||
|
||||
static void callchain_node__init_have_children(struct callchain_node *node)
|
||||
static void callchain_node__init_have_children(struct callchain_node *node,
|
||||
bool has_sibling)
|
||||
{
|
||||
struct callchain_list *chain;
|
||||
|
||||
chain = list_entry(node->val.next, struct callchain_list, list);
|
||||
chain->ms.has_children = has_sibling;
|
||||
|
||||
if (!list_empty(&node->val)) {
|
||||
chain = list_entry(node->val.prev, struct callchain_list, list);
|
||||
chain->ms.has_children = !RB_EMPTY_ROOT(&node->rb_root);
|
||||
|
@ -241,11 +245,12 @@ static void callchain_node__init_have_children(struct callchain_node *node)
|
|||
|
||||
static void callchain__init_have_children(struct rb_root *root)
|
||||
{
|
||||
struct rb_node *nd;
|
||||
struct rb_node *nd = rb_first(root);
|
||||
bool has_sibling = nd && rb_next(nd);
|
||||
|
||||
for (nd = rb_first(root); nd; nd = rb_next(nd)) {
|
||||
struct callchain_node *node = rb_entry(nd, struct callchain_node, rb_node);
|
||||
callchain_node__init_have_children(node);
|
||||
callchain_node__init_have_children(node, has_sibling);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue