[tip:perf/urgent] perf annotate: Allocate history size correctly

From: tip-bot for Nick Piggin
Date: Tue Nov 17 2009 - 12:19:48 EST


Commit-ID: d62d77fd18cc82e839e49b7ef3360e4411f7d2e5
Gitweb: http://git.kernel.org/tip/d62d77fd18cc82e839e49b7ef3360e4411f7d2e5
Author: Nick Piggin <npiggin@xxxxxxx>
AuthorDate: Tue, 17 Nov 2009 12:29:38 +0100
Committer: Ingo Molnar <mingo@xxxxxxx>
CommitDate: Tue, 17 Nov 2009 16:47:09 +0100

perf annotate: Allocate history size correctly

Symbol offset history table size does not get updated properly
when it is being resized. This leads to garbage results in
perf annotate.

Signed-off-by: Nick Piggin <npiggin@xxxxxxx>
Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Cc: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
Cc: Mike Galbraith <efault@xxxxxx>
LKML-Reference: <new-submission>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
---
tools/perf/util/symbol.c | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c
index 226f44a..cbac575 100644
--- a/tools/perf/util/symbol.c
+++ b/tools/perf/util/symbol.c
@@ -227,6 +227,10 @@ static int dso__load_kallsyms(struct dso *self, symbol_filter_t filter, int v)
*curr = rb_entry(nd, struct symbol, rb_node);

prev->end = curr->start - 1;
+ if (prev->hist) {
+ free(prev->hist);
+ prev->hist = calloc(sizeof(u64), prev->end - prev->start);
+ }
prevnd = nd;
}

@@ -883,6 +887,10 @@ static inline void dso__fill_symbol_holes(struct dso *self)
pos->end = prev->end;
else if (hole)
pos->end = prev->start - 1;
+ if (pos->hist) {
+ free(pos->hist);
+ pos->hist = calloc(sizeof(u64), pos->end - pos->start);
+ }
}
}
prev = pos;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/