diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2011-10-17 09:05:04 -0200 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2011-10-17 09:05:04 -0200 |
| commit | b079d4e975b6338bcf8f8868eb2b3d3fd867b933 (patch) | |
| tree | a8758ecb16f56a4f457c67351a5541d308247624 /tools/perf | |
| parent | c73a3cb356f94b443aa7624b539493191dbf44c1 (diff) | |
| download | linux-b079d4e975b6338bcf8f8868eb2b3d3fd867b933.tar.bz2 | |
perf top: Honour --hide_{user,kernel}_symbols and the 'U' hotkey
The new decay routine (__hists__decay_entries) wasn't being passed the
toggles, fix it.
Reported-by: Mike Galbraith <efault@gmx.de>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-hg6m0mi1colket982oq9hhly@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf')
| -rw-r--r-- | tools/perf/builtin-top.c | 8 | ||||
| -rw-r--r-- | tools/perf/util/hist.c | 17 | ||||
| -rw-r--r-- | tools/perf/util/hist.h | 5 |
3 files changed, 20 insertions, 10 deletions
diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c index e211304a0dd7..bf368f1663d1 100644 --- a/tools/perf/builtin-top.c +++ b/tools/perf/builtin-top.c @@ -304,7 +304,9 @@ static void print_sym_table(void) hists__collapse_resort_threaded(&top.sym_evsel->hists); hists__output_resort_threaded(&top.sym_evsel->hists); - hists__decay_entries_threaded(&top.sym_evsel->hists); + hists__decay_entries_threaded(&top.sym_evsel->hists, + top.hide_user_symbols, + top.hide_kernel_symbols); hists__output_recalc_col_len(&top.sym_evsel->hists, winsize.ws_row - 3); putchar('\n'); hists__fprintf(&top.sym_evsel->hists, NULL, false, false, @@ -555,7 +557,9 @@ static void perf_top__sort_new_samples(void *arg) hists__collapse_resort_threaded(&t->sym_evsel->hists); hists__output_resort_threaded(&t->sym_evsel->hists); - hists__decay_entries_threaded(&t->sym_evsel->hists); + hists__decay_entries_threaded(&t->sym_evsel->hists, + top.hide_user_symbols, + top.hide_kernel_symbols); hists__output_recalc_col_len(&t->sym_evsel->hists, winsize.ws_row - 3); } diff --git a/tools/perf/util/hist.c b/tools/perf/util/hist.c index a7193c5a0422..48da373afa3d 100644 --- a/tools/perf/util/hist.c +++ b/tools/perf/util/hist.c @@ -108,7 +108,8 @@ static bool hists__decay_entry(struct hists *hists, struct hist_entry *he) return he->period == 0; } -static void __hists__decay_entries(struct hists *hists, bool threaded) +static void __hists__decay_entries(struct hists *hists, bool zap_user, + bool zap_kernel, bool threaded) { struct rb_node *next = rb_first(&hists->entries); struct hist_entry *n; @@ -121,7 +122,10 @@ static void __hists__decay_entries(struct hists *hists, bool threaded) * case some it gets new samples, we'll eventually free it when * the user stops browsing and it agains gets fully decayed. */ - if (hists__decay_entry(hists, n) && !n->used) { + if (((zap_user && n->level == '.') || + (zap_kernel && n->level != '.') || + hists__decay_entry(hists, n)) && + !n->used) { rb_erase(&n->rb_node, &hists->entries); if (sort__need_collapse || threaded) @@ -133,14 +137,15 @@ static void __hists__decay_entries(struct hists *hists, bool threaded) } } -void hists__decay_entries(struct hists *hists) +void hists__decay_entries(struct hists *hists, bool zap_user, bool zap_kernel) { - return __hists__decay_entries(hists, false); + return __hists__decay_entries(hists, zap_user, zap_kernel, false); } -void hists__decay_entries_threaded(struct hists *hists) +void hists__decay_entries_threaded(struct hists *hists, + bool zap_user, bool zap_kernel) { - return __hists__decay_entries(hists, true); + return __hists__decay_entries(hists, zap_user, zap_kernel, true); } /* diff --git a/tools/perf/util/hist.h b/tools/perf/util/hist.h index bcc8ab91e26f..ea96c1cbb850 100644 --- a/tools/perf/util/hist.h +++ b/tools/perf/util/hist.h @@ -78,8 +78,9 @@ void hists__output_resort_threaded(struct hists *hists); void hists__collapse_resort(struct hists *self); void hists__collapse_resort_threaded(struct hists *hists); -void hists__decay_entries(struct hists *hists); -void hists__decay_entries_threaded(struct hists *hists); +void hists__decay_entries(struct hists *hists, bool zap_user, bool zap_kernel); +void hists__decay_entries_threaded(struct hists *hists, bool zap_user, + bool zap_kernel); void hists__output_recalc_col_len(struct hists *hists, int max_rows); void hists__inc_nr_events(struct hists *self, u32 type); |