perf symbols: Allow lookups by symbol name too

[~andy/linux] / tools / perf / util / symbol.h

diff --git a/tools/perf/util/symbol.h b/tools/perf/util/symbol.h
index b42d196dd8e9a19401c691b47b09a71a896ccbd5..51c401307bf13e048fcbdf29e5e80c4273b57875 100644 (file)
--- a/tools/perf/util/symbol.h
+++ b/tools/perf/util/symbol.h
@@ -52,7 +52,8 @@ struct symbol {
 struct symbol_conf {
        unsigned short  priv_size;
        bool            try_vmlinux_path,
-                       use_modules;
+                       use_modules,
+                       sort_by_name;
        const char      *vmlinux_name;
 };
 
@@ -63,16 +64,27 @@ static inline void *symbol__priv(struct symbol *self)
        return ((void *)self) - symbol__priv_size;
 }
 
+struct addr_location {
+       struct thread *thread;
+       struct map    *map;
+       struct symbol *sym;
+       u64           addr;
+       char          level;
+};
+
 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 rb_root   symbol_names[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               loaded:1;
        u8               has_build_id:1;
        u8               kernel:1;
        unsigned char    origin;
+       u8               sorted_by_name;
+       u8               loaded;
        u8               build_id[BUILD_ID_SIZE];
        u16              long_name_len;
        const char       *short_name;
@@ -83,7 +95,10 @@ 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);
+bool dso__sorted_by_name(const struct dso *self, enum map_type type);
+
+void dso__sort_by_name(struct dso *self, enum map_type type);
 
 struct dso *dsos__findnew(const char *name);
 int dso__load(struct dso *self, struct map *map, symbol_filter_t filter);
@@ -91,9 +106,11 @@ void dsos__fprintf(FILE *fp);
 size_t dsos__fprintf_buildid(FILE *fp);
 
 size_t dso__fprintf_buildid(struct dso *self, FILE *fp);
-size_t dso__fprintf(struct dso *self, FILE *fp);
+size_t dso__fprintf(struct dso *self, enum map_type type, FILE *fp);
 char dso__symtab_origin(const struct dso *self);
 void dso__set_build_id(struct dso *self, void *build_id);
+struct symbol *dso__find_symbol_by_name(struct dso *self, enum map_type type,
+                                       const char *name);
 
 int filename__read_build_id(const char *filename, void *bf, size_t size);
 int sysfs__read_build_id(const char *filename, void *bf, size_t size);
@@ -104,7 +121,8 @@ size_t kernel_maps__fprintf(FILE *fp);
 
 int symbol__init(struct symbol_conf *conf);
 
-extern struct list_head dsos;
-extern struct map *kernel_map__functions;
+struct map_groups;
+struct map_groups *kmaps;
+extern struct list_head dsos__user, dsos__kernel;
 extern struct dso *vdso;
 #endif /* __PERF_SYMBOL */