nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

perf diff: Use internal rb tree for compute resort

Browse source 
There's no reason to run hists_compute_resort() using output tree.
Convert it to use internal tree so that it can remove unnecessary
_output_resort.

Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Acked-by: Jiri Olsa <jolsa@redhat.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/1355128197-18193-4-git-send-email-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Namhyung Kim 2012-12-10 17:29:56 +09:00 committed by Arnaldo Carvalho de Melo
parent ce74f60eab
commit 66f97ed3ac
3 changed files with 23 additions and 11 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

31
tools/perf/builtin-diff.c
View file

@ -414,19 +414,30 @@ static void insert_hist_entry_by_compute(struct rb_root *root,
static void hists__compute_resort(struct hists *hists) static void hists__compute_resort(struct hists *hists)
{ {
struct rb_root tmp = RB_ROOT; struct rb_root *root;
struct rb_node *next = rb_first(&hists->entries); struct rb_node *next;
if (sort__need_collapse)
root = &hists->entries_collapsed;
else
root = hists->entries_in;
hists->entries = RB_ROOT;
next = rb_first(root);
hists->nr_entries = 0;
hists->stats.total_period = 0;
hists__reset_col_len(hists);
while (next != NULL) { while (next != NULL) {
struct hist_entry *he = rb_entry(next, struct hist_entry, rb_node); struct hist_entry *he;
next = rb_next(&he->rb_node); he = rb_entry(next, struct hist_entry, rb_node_in);
next = rb_next(&he->rb_node_in);
rb_erase(&he->rb_node, &hists->entries); insert_hist_entry_by_compute(&hists->entries, he, compute);
insert_hist_entry_by_compute(&tmp, he, compute); hists__inc_nr_entries(hists, he);
} }
hists->entries = tmp;
} }
static void hists__process(struct hists *old, struct hists *new) static void hists__process(struct hists *old, struct hists *new)
@ -438,11 +449,11 @@ static void hists__process(struct hists *old, struct hists *new)
else else
hists__link(new, old); hists__link(new, old);
hists__output_resort(new);
if (sort_compute) { if (sort_compute) {
hists__precompute(new); hists__precompute(new);
hists__compute_resort(new); hists__compute_resort(new);
} else {
hists__output_resort(new);
} }
hists__fprintf(new, true, 0, 0, stdout); hists__fprintf(new, true, 0, 0, stdout);

2
tools/perf/util/hist.c
View file

@ -251,7 +251,7 @@ static struct hist_entry *hist_entry__new(struct hist_entry *template)
return he; return he;
} }
static void hists__inc_nr_entries(struct hists *hists, struct hist_entry *h) void hists__inc_nr_entries(struct hists *hists, struct hist_entry *h)
{ {
if (!h->filtered) { if (!h->filtered) {
hists__calc_col_len(hists, h); hists__calc_col_len(hists, h);

1
tools/perf/util/hist.h
View file

@ -96,6 +96,7 @@ void hists__decay_entries_threaded(struct hists *hists, bool zap_user,
bool zap_kernel); bool zap_kernel);
void hists__output_recalc_col_len(struct hists *hists, int max_rows); void hists__output_recalc_col_len(struct hists *hists, int max_rows);
void hists__inc_nr_entries(struct hists *hists, struct hist_entry *h);
void hists__inc_nr_events(struct hists *self, u32 type); void hists__inc_nr_events(struct hists *self, u32 type);
size_t hists__fprintf_nr_events(struct hists *self, FILE *fp); size_t hists__fprintf_nr_events(struct hists *self, FILE *fp);