summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@redhat.com>2011-10-20 06:45:44 -0200
committerArnaldo Carvalho de Melo <acme@redhat.com>2011-10-20 06:45:44 -0200
commitc64550cfddfdbd7a6f9d5ffb37382a05d7f0306b (patch)
tree61f599063631672d8e1d9b56e516d6954ba44784 /tools
parent2cf9cebf0878e384630f6fd5e1abd830c0cd99b3 (diff)
downloadlinux-3.10-c64550cfddfdbd7a6f9d5ffb37382a05d7f0306b.tar.gz
linux-3.10-c64550cfddfdbd7a6f9d5ffb37382a05d7f0306b.tar.bz2
linux-3.10-c64550cfddfdbd7a6f9d5ffb37382a05d7f0306b.zip
perf hists: Don't decay total_period for filtered entries
Following the 'perf report' model we don't zap hist_entry instances from the rb tree, we just keep them with he->filtered set to a mask of the filters applied to it (thread, parent, DSO so far). In top we need to decay even filtered entries, but we better not touch total_period for them... Now everything seems to work when filters are applied on top as they worked in 'report', i.e. both dynamic and static hist entry browsing works with filters. 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-yt4xsbq20u9x9ypuwwyw2kao@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/perf/util/hist.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/tools/perf/util/hist.c b/tools/perf/util/hist.c
index 75526d123eb..1f269fd4894 100644
--- a/tools/perf/util/hist.c
+++ b/tools/perf/util/hist.c
@@ -105,11 +105,16 @@ static void hist_entry__decay(struct hist_entry *he)
static bool hists__decay_entry(struct hists *hists, struct hist_entry *he)
{
- if (he->period == 0)
+ u64 prev_period = he->period;
+
+ if (prev_period == 0)
return true;
- hists->stats.total_period -= he->period;
+
hist_entry__decay(he);
- hists->stats.total_period += he->period;
+
+ if (!he->filtered)
+ hists->stats.total_period -= prev_period - he->period;
+
return he->period == 0;
}