Skip to contentSkip to conversation

perf annotate: Fix hist decay

tip:perf/core tip-bot for Arnaldo Carvalho de Melo 1 participant 1 message Apr 13, 2012 perf events

lore
Share & tools
lore
#0 lore raw
Commit-ID:  8b84a568117fde9b77575f2060274eddab424c32
Gitweb:     http://git.kernel.org/tip/8b84a568117fde9b77575f2060274eddab424c32
Author:     Arnaldo Carvalho de Melo <[email protected]>
AuthorDate: Thu, 5 Apr 2012 16:15:59 -0300
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Thu, 5 Apr 2012 18:49:18 -0300

perf annotate: Fix hist decay

We were only decaying the entries for the offsets that were associated with an objdump line.

That way, when we accrued the whole instruction addr range, more than 100% was appearing in some cases in the live annotation TUI.

Fix it by not traversing the source code line at all, just iterate thru the complete addr range decaying each one.

Cc David Ahern <[email protected]>
Cc Frederic Weisbecker <[email protected]>
Cc Mike Galbraith <[email protected]>
Cc Namhyung Kim <[email protected]>
Cc Paul Mackerras <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Stephane Eranian <[email protected]>
---
 tools/perf/util/annotate.c |   12 ++++--------
 1 files changed, 4 insertions(+), 8 deletions(-)
tools/perf/util/annotate.c +4 -8
index 199f69e..70f5a4d 100644
@@ -561,16 +561,12 @@ void symbol__annotate_decay_histogram(struct symbol *sym, int evidx)
 {
 	struct annotation *notes = symbol__annotation(sym);
 	struct sym_hist *h = annotation__histogram(notes, evidx);
-	struct objdump_line *pos;
-	int len = sym->end - sym->start;
+	int len = sym->end - sym->start, offset;
 
 	h->sum = 0;
-
-	list_for_each_entry(pos, &notes->src->source, node) {
-		if (pos->offset != -1 && pos->offset < len) {
-			h->addr[pos->offset] = h->addr[pos->offset] * 7 / 8;
-			h->sum += h->addr[pos->offset];
-		}
+	for (offset = 0; offset < len; ++offset) {
+		h->addr[offset] = h->addr[offset] * 7 / 8;
+		h->sum += h->addr[offset];
 	}
 }