summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorAndres Freund <andres@anarazel.de>2016-03-30 21:02:45 +0200
committerArnaldo Carvalho de Melo <acme@redhat.com>2016-03-30 18:08:39 -0300
commit909890355507e92bdaf648e73870f6b5df606da8 (patch)
tree890ec9b1b6f9f9ad29adb46c39136230984fc3e2 /tools
parentf6343be96ebbae38a07e0878810f5bbc0c38cade (diff)
downloadlinux-909890355507e92bdaf648e73870f6b5df606da8.tar.gz
linux-909890355507e92bdaf648e73870f6b5df606da8.tar.bz2
linux-909890355507e92bdaf648e73870f6b5df606da8.zip
perf hists: Fix determination of a callchain node's childlessness
The 4b3a3212233a ("perf hists browser: Support flat callchains") commit over-aggressively tried to optimize callchain_node__init_have_children(). That lead to --tui mode not allowing to expand call chain elements if a call chain element had only one parent. That's why --inverted callgraphs looked halfway sane, but plain ones didn't. Revert that individual optimization, it wasn't really related to the rest of the commit. Signed-off-by: Andres Freund <andres@anarazel.de> Acked-by: Namhyung Kim <namhyung@kernel.org> Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Fixes: 4b3a3212233a ("perf hists browser: Support flat callchains") Link: http://lkml.kernel.org/r/20160330190245.GB13305@awork2.anarazel.de Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/perf/ui/browsers/hists.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/ui/browsers/hists.c b/tools/perf/ui/browsers/hists.c
index 4b9816555946..2a83414159a6 100644
--- a/tools/perf/ui/browsers/hists.c
+++ b/tools/perf/ui/browsers/hists.c
@@ -337,7 +337,7 @@ static void callchain_node__init_have_children(struct callchain_node *node,
chain = list_entry(node->val.next, struct callchain_list, list);
chain->has_children = has_sibling;
- if (node->val.next != node->val.prev) {
+ if (!list_empty(&node->val)) {
chain = list_entry(node->val.prev, struct callchain_list, list);
chain->has_children = !RB_EMPTY_ROOT(&node->rb_root);
}