Re: [PATCH v6 10/25] perf hists: Resort hist entries with hierarchy

Jiri Olsa
2016-02-20T23:19:31Z

On Tue, Feb 16, 2016 at 11:08:28PM +0900, Namhyung Kim wrote:

SNIP

> @@ -1349,6 +1427,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
> @@ -1357,9 +1446,6 @@ static void output_resort(struct hists *hists, struct ui_progress *prog,
> next = rb_first(root);
> hists->entries = RB_ROOT;

above line could be moved together with those 2 below
and you can then remove *root_out = RB_ROOT; line in
hists__hierarchy_output_resort

jirka

>
> - 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
>