Messages in this thread Patch in this message | | | From | Jiri Olsa <> | Subject | [PATCH 01/14] perf diff: Use internal rb tree for hists__precompute | Date | Thu, 13 Dec 2012 14:08:59 +0100 |
| |
There's missing change for hists__precompute to iterate either entries_collapsed or entries_in tree. The change was initiated for hists_compute_resort function in commit:
2a2d3ce perf diff: Use internal rb tree for compute resort
but was missing for hists__precompute function changes.
Signed-off-by: Jiri Olsa <jolsa@redhat.com> Cc: Arnaldo Carvalho de Melo <acme@ghostprotocols.net> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Ingo Molnar <mingo@elte.hu> Cc: Paul Mackerras <paulus@samba.org> Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com> Cc: Frederic Weisbecker <fweisbec@gmail.com> Cc: Namhyung Kim <namhyung@kernel.org> --- tools/perf/builtin-diff.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/tools/perf/builtin-diff.c b/tools/perf/builtin-diff.c index 4af0b58..1f0a22d 100644 --- a/tools/perf/builtin-diff.c +++ b/tools/perf/builtin-diff.c @@ -322,13 +322,22 @@ static void hists__baseline_only(struct hists *hists) static void hists__precompute(struct hists *hists) { - struct rb_node *next = rb_first(&hists->entries); + struct rb_root *root; + struct rb_node *next; + + if (sort__need_collapse) + root = &hists->entries_collapsed; + else + root = hists->entries_in; + next = rb_first(root); while (next != NULL) { - struct hist_entry *he = rb_entry(next, struct hist_entry, rb_node); - struct hist_entry *pair = hist_entry__next_pair(he); + struct hist_entry *he, *pair; - next = rb_next(&he->rb_node); + he = rb_entry(next, struct hist_entry, rb_node_in); + pair = hist_entry__next_pair(he); + + next = rb_next(&he->rb_node_in); if (!pair) continue; -- 1.7.11.7
| |