perf hists: Add missing update on filtered stats in hists__decay_entries()

When a filter is used for perf top, its hists->nr_non_filtered_entries
was not updated after it removed an entry in hists__decay_entries().
Also hists->stats.total_non_filtered_period was missed too.

Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Link: http://lkml.kernel.org/r/1398327843-31845-8-git-send-email-namhyung@kernel.org
Signed-off-by: Jiri Olsa <jolsa@kernel.org>

diff --git a/tools/perf/util/hist.c b/tools/perf/util/hist.c
index 6d0d2d75db68ebf2aaa33d0090f89fc29454d7b8..7f0236cea4fe5f79c6871bffdf1beb5dcfb52c1c 100644 (file)
--- a/tools/perf/util/hist.c
+++ b/tools/perf/util/hist.c
@@ -225,14 +225,18 @@ static void he_stat__decay(struct he_stat *he_stat)
 static bool hists__decay_entry(struct hists *hists, struct hist_entry *he)
 {
        u64 prev_period = he->stat.period;
+       u64 diff;
 
        if (prev_period == 0)
                return true;
 
        he_stat__decay(&he->stat);
 
+       diff = prev_period - he->stat.period;
+
+       hists->stats.total_period -= diff;
        if (!he->filtered)
-               hists->stats.total_period -= prev_period - he->stat.period;
+               hists->stats.total_non_filtered_period -= diff;
 
        return he->stat.period == 0;
 }
@@ -259,8 +263,11 @@ void hists__decay_entries(struct hists *hists, bool zap_user, bool zap_kernel)
                        if (sort__need_collapse)
                                rb_erase(&n->rb_node_in, &hists->entries_collapsed);
 
-                       hist_entry__free(n);
                        --hists->nr_entries;
+                       if (!n->filtered)
+                               --hists->nr_non_filtered_entries;
+
+                       hist_entry__free(n);
                }
        }
 }