lkml.org 
[lkml]   [2016]   [May]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.5 182/200] perf hists: Fix determination of a callchain nodes childlessness
    Date
    4.5-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Andres Freund <andres@anarazel.de>

    commit 909890355507e92bdaf648e73870f6b5df606da8 upstream.

    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>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    tools/perf/ui/browsers/hists.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- a/tools/perf/ui/browsers/hists.c
    +++ b/tools/perf/ui/browsers/hists.c
    @@ -302,7 +302,7 @@ static void callchain_node__init_have_ch
    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);
    }

    \
     
     \ /
      Last update: 2016-05-03 03:01    [W:6.832 / U:0.028 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site