diff options
author | Jiri Olsa <jolsa@redhat.com> | 2012-12-13 08:08:59 -0500 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2013-05-28 09:24:02 -0400 |
commit | 367c53c08f84bb554a3aae18b65e5419fe4b164a (patch) | |
tree | 555cf88faf5aa41660851abc555602790d023cc7 /tools | |
parent | eec574e6bc3ee4558d4a282e0e3e1bd6dd0ad67b (diff) |
perf diff: Use internal rb tree for hists__precompute
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:
66f97ed 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: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1355404152-16523-2-git-send-email-jolsa@redhat.com
[ committer note: Reduce patch size, no functional change ]
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools')
-rw-r--r-- | tools/perf/builtin-diff.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/tools/perf/builtin-diff.c b/tools/perf/builtin-diff.c index a9d63c1c64c5..da8f8eb383a0 100644 --- a/tools/perf/builtin-diff.c +++ b/tools/perf/builtin-diff.c | |||
@@ -323,13 +323,20 @@ static void hists__baseline_only(struct hists *hists) | |||
323 | 323 | ||
324 | static void hists__precompute(struct hists *hists) | 324 | static void hists__precompute(struct hists *hists) |
325 | { | 325 | { |
326 | struct rb_node *next = rb_first(&hists->entries); | 326 | struct rb_root *root; |
327 | struct rb_node *next; | ||
328 | |||
329 | if (sort__need_collapse) | ||
330 | root = &hists->entries_collapsed; | ||
331 | else | ||
332 | root = hists->entries_in; | ||
327 | 333 | ||
334 | next = rb_first(root); | ||
328 | while (next != NULL) { | 335 | while (next != NULL) { |
329 | struct hist_entry *he = rb_entry(next, struct hist_entry, rb_node); | 336 | struct hist_entry *he = rb_entry(next, struct hist_entry, rb_node_in); |
330 | struct hist_entry *pair = hist_entry__next_pair(he); | 337 | struct hist_entry *pair = hist_entry__next_pair(he); |
331 | 338 | ||
332 | next = rb_next(&he->rb_node); | 339 | next = rb_next(&he->rb_node_in); |
333 | if (!pair) | 340 | if (!pair) |
334 | continue; | 341 | continue; |
335 | 342 | ||