lkml.org 
[lkml]   [2016]   [Feb]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v7 17/18] perf hists: Support decaying in hierarchy mode
    Date
    In the hierarchy mode, hist entries should decay their children too.
    Also update hists__delete_entry() to be able to free child entries.

    Acked-by: Pekka Enberg <penberg@kernel.org>
    Signed-off-by: Namhyung Kim <namhyung@kernel.org>
    ---
    tools/perf/util/hist.c | 42 ++++++++++++++++++++++++++++++++++--------
    1 file changed, 34 insertions(+), 8 deletions(-)

    diff --git a/tools/perf/util/hist.c b/tools/perf/util/hist.c
    index 9019884b72f5..0097babfc9a5 100644
    --- a/tools/perf/util/hist.c
    +++ b/tools/perf/util/hist.c
    @@ -248,6 +248,8 @@ static void he_stat__decay(struct he_stat *he_stat)
    /* XXX need decay for weight too? */
    }

    +static void hists__delete_entry(struct hists *hists, struct hist_entry *he);
    +
    static bool hists__decay_entry(struct hists *hists, struct hist_entry *he)
    {
    u64 prev_period = he->stat.period;
    @@ -263,21 +265,45 @@ static bool hists__decay_entry(struct hists *hists, struct hist_entry *he)

    diff = prev_period - he->stat.period;

    - hists->stats.total_period -= diff;
    - if (!he->filtered)
    - hists->stats.total_non_filtered_period -= diff;
    + if (!he->depth) {
    + hists->stats.total_period -= diff;
    + if (!he->filtered)
    + hists->stats.total_non_filtered_period -= diff;
    + }
    +
    + if (!he->leaf) {
    + struct hist_entry *child;
    + struct rb_node *node = rb_first(&he->hroot_out);
    + while (node) {
    + child = rb_entry(node, struct hist_entry, rb_node);
    + node = rb_next(node);
    +
    + if (hists__decay_entry(hists, child))
    + hists__delete_entry(hists, child);
    + }
    + }

    return he->stat.period == 0;
    }

    static void hists__delete_entry(struct hists *hists, struct hist_entry *he)
    {
    - rb_erase(&he->rb_node, &hists->entries);
    + struct rb_root *root_in;
    + struct rb_root *root_out;

    - if (sort__need_collapse)
    - rb_erase(&he->rb_node_in, &hists->entries_collapsed);
    - else
    - rb_erase(&he->rb_node_in, hists->entries_in);
    + if (he->parent_he) {
    + root_in = &he->parent_he->hroot_in;
    + root_out = &he->parent_he->hroot_out;
    + } else {
    + if (sort__need_collapse)
    + root_in = &hists->entries_collapsed;
    + else
    + root_in = hists->entries_in;
    + root_out = &hists->entries;
    + }
    +
    + rb_erase(&he->rb_node_in, root_in);
    + rb_erase(&he->rb_node, root_out);

    --hists->nr_entries;
    if (!he->filtered)
    --
    2.7.1
    \
     
     \ /
      Last update: 2016-02-24 16:41    [W:4.182 / U:0.032 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site