From 6a3cc51335bedfae8bbc33d638bde8a0593ee709 Mon Sep 17 00:00:00 2001 From: Arnaldo Carvalho de Melo Date: Mon, 17 Oct 2011 09:05:04 -0200 Subject: [PATCH] --- yaml --- r: 269098 b: refs/heads/master c: b079d4e975b6338bcf8f8868eb2b3d3fd867b933 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/trace/trace.c | 8 ++++---- trunk/tools/perf/builtin-top.c | 8 ++++++-- trunk/tools/perf/util/hist.c | 17 +++++++++++------ trunk/tools/perf/util/hist.h | 5 +++-- 5 files changed, 25 insertions(+), 15 deletions(-) diff --git a/[refs] b/[refs] index 95f7724c9957..9e3f1ce1348d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 53b0a61a9d31ef9b4256558c671094576e8eaf65 +refs/heads/master: b079d4e975b6338bcf8f8868eb2b3d3fd867b933 diff --git a/trunk/kernel/trace/trace.c b/trunk/kernel/trace/trace.c index b24a72d35008..f86efe90ca45 100644 --- a/trunk/kernel/trace/trace.c +++ b/trunk/kernel/trace/trace.c @@ -2720,9 +2720,9 @@ static const char readme_msg[] = "# cat /sys/kernel/debug/tracing/trace_options\n" "noprint-parent nosym-offset nosym-addr noverbose\n" "# echo print-parent > /sys/kernel/debug/tracing/trace_options\n" - "# echo 1 > /sys/kernel/debug/tracing/tracing_on\n" + "# echo 1 > /sys/kernel/debug/tracing/tracing_enabled\n" "# cat /sys/kernel/debug/tracing/trace > /tmp/trace.txt\n" - "# echo 0 > /sys/kernel/debug/tracing/tracing_on\n" + "# echo 0 > /sys/kernel/debug/tracing/tracing_enabled\n" ; static ssize_t @@ -3903,6 +3903,8 @@ tracing_buffers_read(struct file *filp, char __user *ubuf, if (info->read < PAGE_SIZE) goto read; + info->read = 0; + trace_access_lock(info->cpu); ret = ring_buffer_read_page(info->tr->buffer, &info->spare, @@ -3912,8 +3914,6 @@ tracing_buffers_read(struct file *filp, char __user *ubuf, if (ret < 0) return 0; - info->read = 0; - read: size = PAGE_SIZE - info->read; if (size > count) diff --git a/trunk/tools/perf/builtin-top.c b/trunk/tools/perf/builtin-top.c index e211304a0dd7..bf368f1663d1 100644 --- a/trunk/tools/perf/builtin-top.c +++ b/trunk/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/trunk/tools/perf/util/hist.c b/trunk/tools/perf/util/hist.c index a7193c5a0422..48da373afa3d 100644 --- a/trunk/tools/perf/util/hist.c +++ b/trunk/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/trunk/tools/perf/util/hist.h b/trunk/tools/perf/util/hist.h index bcc8ab91e26f..ea96c1cbb850 100644 --- a/trunk/tools/perf/util/hist.h +++ b/trunk/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);