perf symbols: Better support for multiple symbol tables per dso

By using an array of rb_roots in struct dso we can, from a
struct map instance to get the right symbol rb_tree more easily.
This way we can have just one symbol lookup method for struct
map instances, map__find_symbol, instead of one per symtab type
(functions, variables).

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Frédéric Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
LKML-Reference: <1259346563-12568-6-git-send-email-acme@infradead.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 3 insertions, 4 deletions

diff --git a/tools/perf/util/symbol.h b/tools/perf/util/symbol.h
index 11d41952ce04..8934814d5a64 100644
--- a/tools/perf/util/symbol.h
+++ b/tools/perf/util/symbol.h
@@ -65,8 +65,9 @@ static inline void *symbol__priv(struct symbol *self)
 
 struct dso {
         struct list_head node;
-        struct rb_root   functions;
-        struct symbol    *(*find_function)(struct dso *, u64 ip);
+        struct rb_root   symbols[MAP__NR_TYPES];
+        struct symbol    *(*find_symbol)(struct dso *self,
+                                         enum map_type type, u64 addr);
         u8               adjust_symbols:1;
         u8               slen_calculated:1;
         u8               has_build_id:1;
@@ -83,8 +84,6 @@ struct dso {
 struct dso *dso__new(const char *name);
 void dso__delete(struct dso *self);
 
-struct symbol *dso__find_function(struct dso *self, u64 ip);
-
 bool dso__loaded(const struct dso *self, enum map_type type);
 
 struct dso *dsos__findnew(const char *name);