]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
perf annotate: Allocate history size correctly
authorNick Piggin <npiggin@suse.de>
Tue, 17 Nov 2009 11:29:38 +0000 (12:29 +0100)
committerIngo Molnar <mingo@elte.hu>
Tue, 17 Nov 2009 15:47:09 +0000 (16:47 +0100)
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@suse.de>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
LKML-Reference: <new-submission>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
tools/perf/util/symbol.c

index 226f44a2357de7baf900271a58b12cddffed50c0..cbac57549298628307e1e9adb149560725c275bc 100644 (file)
@@ -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;