perf hists: Collapse expanded callchains after filter is applied

[deliverable/linux.git] / tools / perf / util / hist.c

diff --git a/tools/perf/util/hist.c b/tools/perf/util/hist.c
index 3c2dd233b98e1019b2039845e34ae90794418bb3..8d5cfcc3bc631876db6cef75870f1df512a64b64 100644 (file)
--- a/tools/perf/util/hist.c
+++ b/tools/perf/util/hist.c
@@ -317,17 +317,6 @@ static struct hist_entry *hist_entry__new(struct hist_entry *template)
        return he;
 }
 
-void hists__inc_nr_entries(struct hists *hists, struct hist_entry *h)
-{
-       if (!h->filtered) {
-               hists__calc_col_len(hists, h);
-               hists->nr_non_filtered_entries++;
-               hists->stats.total_non_filtered_period += h->stat.period;
-       }
-       hists->nr_entries++;
-       hists->stats.total_period += h->stat.period;
-}
-
 static u8 symbol__parent_filter(const struct symbol *parent)
 {
        if (symbol_conf.exclude_other && parent == NULL)
@@ -633,6 +622,35 @@ out:
        return ret;
 }
 
+static void hists__reset_filter_stats(struct hists *hists)
+{
+       hists->nr_non_filtered_entries = 0;
+       hists->stats.total_non_filtered_period = 0;
+}
+
+void hists__reset_stats(struct hists *hists)
+{
+       hists->nr_entries = 0;
+       hists->stats.total_period = 0;
+
+       hists__reset_filter_stats(hists);
+}
+
+static void hists__inc_filter_stats(struct hists *hists, struct hist_entry *h)
+{
+       hists->nr_non_filtered_entries++;
+       hists->stats.total_non_filtered_period += h->stat.period;
+}
+
+void hists__inc_stats(struct hists *hists, struct hist_entry *h)
+{
+       if (!h->filtered)
+               hists__inc_filter_stats(hists, h);
+
+       hists->nr_entries++;
+       hists->stats.total_period += h->stat.period;
+}
+
 static void __hists__insert_output_entry(struct rb_root *entries,
                                         struct hist_entry *he,
                                         u64 min_callchain_hits)
@@ -676,9 +694,7 @@ void hists__output_resort(struct hists *hists)
        next = rb_first(root);
        hists->entries = RB_ROOT;
 
-       hists->nr_non_filtered_entries = 0;
-       hists->stats.total_period = 0;
-       hists->stats.total_non_filtered_period = 0;
+       hists__reset_stats(hists);
        hists__reset_col_len(hists);
 
        while (next) {
@@ -686,7 +702,10 @@ void hists__output_resort(struct hists *hists)
                next = rb_next(&n->rb_node_in);
 
                __hists__insert_output_entry(&hists->entries, n, min_callchain_hits);
-               hists__inc_nr_entries(hists, n);
+               hists__inc_stats(hists, n);
+
+               if (!n->filtered)
+                       hists__calc_col_len(hists, n);
        }
 }
 
@@ -697,13 +716,13 @@ static void hists__remove_entry_filter(struct hists *hists, struct hist_entry *h
        if (h->filtered)
                return;
 
-       ++hists->nr_non_filtered_entries;
-       if (h->ms.unfolded)
-               hists->nr_non_filtered_entries += h->nr_rows;
+       /* force fold unfiltered entry for simplicity */
+       h->ms.unfolded = false;
        h->row_offset = 0;
-       hists->stats.total_non_filtered_period += h->stat.period;
+
        hists->stats.nr_non_filtered_samples += h->stat.nr_events;
 
+       hists__inc_filter_stats(hists, h);
        hists__calc_col_len(hists, h);
 }
 
@@ -724,9 +743,9 @@ void hists__filter_by_dso(struct hists *hists)
 {
        struct rb_node *nd;
 
-       hists->nr_non_filtered_entries = 0;
-       hists->stats.total_non_filtered_period = 0;
        hists->stats.nr_non_filtered_samples = 0;
+
+       hists__reset_filter_stats(hists);
        hists__reset_col_len(hists);
 
        for (nd = rb_first(&hists->entries); nd; nd = rb_next(nd)) {
@@ -758,9 +777,9 @@ void hists__filter_by_thread(struct hists *hists)
 {
        struct rb_node *nd;
 
-       hists->nr_non_filtered_entries = 0;
-       hists->stats.total_non_filtered_period = 0;
        hists->stats.nr_non_filtered_samples = 0;
+
+       hists__reset_filter_stats(hists);
        hists__reset_col_len(hists);
 
        for (nd = rb_first(&hists->entries); nd; nd = rb_next(nd)) {
@@ -790,9 +809,9 @@ void hists__filter_by_symbol(struct hists *hists)
 {
        struct rb_node *nd;
 
-       hists->nr_non_filtered_entries = 0;
-       hists->stats.total_non_filtered_period = 0;
        hists->stats.nr_non_filtered_samples = 0;
+
+       hists__reset_filter_stats(hists);
        hists__reset_col_len(hists);
 
        for (nd = rb_first(&hists->entries); nd; nd = rb_next(nd)) {
@@ -853,7 +872,7 @@ static struct hist_entry *hists__add_dummy_entry(struct hists *hists,
                he->hists = hists;
                rb_link_node(&he->rb_node_in, parent, p);
                rb_insert_color(&he->rb_node_in, root);
-               hists__inc_nr_entries(hists, he);
+               hists__inc_stats(hists, he);
                he->dummy = true;
        }
 out:
@@ -956,3 +975,11 @@ int parse_filter_percentage(const struct option *opt __maybe_unused,
 
        return 0;
 }
+
+int perf_hist_config(const char *var, const char *value)
+{
+       if (!strcmp(var, "hist.percentage"))
+               return parse_filter_percentage(NULL, value, 0);
+
+       return 0;
+}