Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1342135
| From | Namhyung Kim <namhyung@kernel.org> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH v7 03/18] perf hists: Resort hist entries with hierarchy |
| Date | 2016-02-24 16:30 +0100 |
| Message-ID | <r5Jy2-6wc-29@gated-at.bofh.it> (permalink) |
| References | <r5Jom-6qY-5@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
For hierarchical output, each entries should be sorted in their
rbtree (hroot) properly. Add hists__hierarchy_output_resort() to do the
job. Note that those hierarchy entries share the period counts, it'd be
important to update the hists->stats only once (for leaves).
Acked-by: Pekka Enberg <penberg@kernel.org>
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
---
tools/perf/util/hist.c | 94 ++++++++++++++++++++++++++++++++++++++++++++++++--
1 file changed, 91 insertions(+), 3 deletions(-)
diff --git a/tools/perf/util/hist.c b/tools/perf/util/hist.c
index 881452450959..6ddac2fb29b5 100644
--- a/tools/perf/util/hist.c
+++ b/tools/perf/util/hist.c
@@ -1318,6 +1318,86 @@ void hists__inc_stats(struct hists *hists, struct hist_entry *h)
hists->stats.total_period += h->stat.period;
}
+static void hierarchy_insert_output_entry(struct rb_root *root,
+ struct hist_entry *he)
+{
+ struct rb_node **p = &root->rb_node;
+ struct rb_node *parent = NULL;
+ struct hist_entry *iter;
+
+ while (*p != NULL) {
+ parent = *p;
+ iter = rb_entry(parent, struct hist_entry, rb_node);
+
+ if (hist_entry__sort(he, iter) > 0)
+ p = &parent->rb_left;
+ else
+ p = &parent->rb_right;
+ }
+
+ rb_link_node(&he->rb_node, parent, p);
+ rb_insert_color(&he->rb_node, root);
+}
+
+static void hists__hierarchy_output_resort(struct hists *hists,
+ struct ui_progress *prog,
+ struct rb_root *root_in,
+ struct rb_root *root_out,
+ u64 min_callchain_hits,
+ bool use_callchain)
+{
+ struct rb_node *node;
+ struct hist_entry *he;
+
+ *root_out = RB_ROOT;
+ node = rb_first(root_in);
+
+ while (node) {
+ he = rb_entry(node, struct hist_entry, rb_node_in);
+ node = rb_next(node);
+
+ hierarchy_insert_output_entry(root_out, he);
+
+ if (prog)
+ ui_progress__update(prog, 1);
+
+ if (!he->leaf) {
+ hists__hierarchy_output_resort(hists, prog,
+ &he->hroot_in,
+ &he->hroot_out,
+ min_callchain_hits,
+ use_callchain);
+ hists->nr_entries++;
+ if (!he->filtered) {
+ hists->nr_non_filtered_entries++;
+ hists__calc_col_len(hists, he);
+ }
+
+ continue;
+ }
+
+ /* only update stat for leaf entries to avoid duplication */
+ hists__inc_stats(hists, he);
+ if (!he->filtered)
+ hists__calc_col_len(hists, he);
+
+ if (!use_callchain)
+ continue;
+
+ if (callchain_param.mode == CHAIN_GRAPH_REL) {
+ u64 total = he->stat.period;
+
+ if (symbol_conf.cumulate_callchain)
+ total = he->stat_acc->period;
+
+ min_callchain_hits = total * (callchain_param.min_percent / 100);
+ }
+
+ callchain_param.sort(&he->sorted_chain, he->callchain,
+ min_callchain_hits, &callchain_param);
+ }
+}
+
static void __hists__insert_output_entry(struct rb_root *entries,
struct hist_entry *he,
u64 min_callchain_hits,
@@ -1369,6 +1449,17 @@ static void output_resort(struct hists *hists, struct ui_progress *prog,
min_callchain_hits = callchain_total * (callchain_param.min_percent / 100);
+ hists__reset_stats(hists);
+ hists__reset_col_len(hists);
+
+ if (symbol_conf.report_hierarchy) {
+ return hists__hierarchy_output_resort(hists, prog,
+ &hists->entries_collapsed,
+ &hists->entries,
+ min_callchain_hits,
+ use_callchain);
+ }
+
if (sort__need_collapse)
root = &hists->entries_collapsed;
else
@@ -1377,9 +1468,6 @@ static void output_resort(struct hists *hists, struct ui_progress *prog,
next = rb_first(root);
hists->entries = RB_ROOT;
- hists__reset_stats(hists);
- hists__reset_col_len(hists);
-
while (next) {
n = rb_entry(next, struct hist_entry, rb_node_in);
next = rb_next(&n->rb_node_in);
--
2.7.1
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCHSET 00/18] perf tools: Add support for hierachy view (v7) Namhyung Kim <namhyung@kernel.org> - 2016-02-24 16:20 +0100
[PATCH v7 16/18] perf report: Add --hierarchy option Namhyung Kim <namhyung@kernel.org> - 2016-02-24 16:20 +0100
[tip:perf/core] perf report: Add --hierarchy option tip-bot for Namhyung Kim <tipbot@zytor.com> - 2016-02-25 08:50 +0100
[PATCH v7 12/18] perf hists browser: Support collapsing/expanding whole entries in hierarchy Namhyung Kim <namhyung@kernel.org> - 2016-02-24 16:20 +0100
[tip:perf/core] perf hists browser: Support collapsing/expanding whole entries in hierarchy tip-bot for Namhyung Kim <tipbot@zytor.com> - 2016-02-25 08:50 +0100
[PATCH v7 11/18] perf hists browser: Count number of hierarchy entries Namhyung Kim <namhyung@kernel.org> - 2016-02-24 16:20 +0100
[tip:perf/core] perf hists browser: Count number of hierarchy entries tip-bot for Namhyung Kim <tipbot@zytor.com> - 2016-02-25 08:50 +0100
[PATCH v7 13/18] perf hists browser: Implement hierarchy output Namhyung Kim <namhyung@kernel.org> - 2016-02-24 16:20 +0100
[tip:perf/core] perf hists browser: Implement hierarchy output tip-bot for Namhyung Kim <tipbot@zytor.com> - 2016-02-25 08:50 +0100
[PATCH v7 07/18] perf hists: Resort after filtering hierarchy Namhyung Kim <namhyung@kernel.org> - 2016-02-24 16:30 +0100
[tip:perf/core] perf hists: Resort after filtering hierarchy tip-bot for Namhyung Kim <tipbot@zytor.com> - 2016-02-25 08:50 +0100
[PATCH v7 05/18] perf hists: Introduce hist_entry__filter() Namhyung Kim <namhyung@kernel.org> - 2016-02-24 16:30 +0100
Re: [PATCH v7 05/18] perf hists: Introduce hist_entry__filter() Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-02-25 00:30 +0100
Re: [PATCH v7 05/18] perf hists: Introduce hist_entry__filter() Namhyung Kim <namhyung@kernel.org> - 2016-02-25 03:10 +0100
[tip:perf/core] perf hists: Introduce hist_entry__filter() tip-bot for Namhyung Kim <tipbot@zytor.com> - 2016-02-25 08:50 +0100
[PATCH v7 03/18] perf hists: Resort hist entries with hierarchy Namhyung Kim <namhyung@kernel.org> - 2016-02-24 16:30 +0100
[tip:perf/core] perf hists: Resort hist entries with hierarchy tip-bot for Namhyung Kim <tipbot@zytor.com> - 2016-02-25 08:50 +0100
[PATCH v7 02/18] perf hists: Basic support of hierarchical report view Namhyung Kim <namhyung@kernel.org> - 2016-02-24 16:30 +0100
[tip:perf/core] perf hists: Basic support of hierarchical report view tip-bot for Namhyung Kim <tipbot@zytor.com> - 2016-02-25 08:50 +0100
Re: [PATCHSET 00/18] perf tools: Add support for hierachy view (v7) Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-02-24 21:10 +0100
Re: [PATCHSET 00/18] perf tools: Add support for hierachy view (v7) Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-02-25 00:30 +0100
Re: [PATCHSET 00/18] perf tools: Add support for hierachy view (v7) Namhyung Kim <namhyung@kernel.org> - 2016-02-25 03:20 +0100
Re: [PATCHSET 00/18] perf tools: Add support for hierachy view (v7) Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-02-25 02:30 +0100
Re: [PATCHSET 00/18] perf tools: Add support for hierachy view (v7) Namhyung Kim <namhyung@kernel.org> - 2016-02-25 03:30 +0100
csiph-web