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 51c5a4a0813332326c11adbc6b1b052b1942641d..51c401307bf13e048fcbdf29e5e80c4273b57875 100644 (file)
--- a/tools/perf/util/symbol.h
+++ b/tools/perf/util/symbol.h
@@ -49,6 +49,14 @@ struct symbol {
        char            name[0];
 };
 
+struct symbol_conf {
+       unsigned short  priv_size;
+       bool            try_vmlinux_path,
+                       use_modules,
+                       sort_by_name;
+       const char      *vmlinux_name;
+};
+
 extern unsigned int symbol__priv_size;
 
 static inline void *symbol__priv(struct symbol *self)
@@ -56,16 +64,29 @@ 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   syms;
-       struct symbol    *(*find_symbol)(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;
        char             *long_name;
        char             name[0];
@@ -74,30 +95,34 @@ struct dso {
 struct dso *dso__new(const char *name);
 void dso__delete(struct dso *self);
 
-struct symbol *dso__find_symbol(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);
 
-int dsos__load_kernel(const char *vmlinux, symbol_filter_t filter, int modules);
 struct dso *dsos__findnew(const char *name);
 int dso__load(struct dso *self, struct map *map, symbol_filter_t filter);
 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);
-bool fetch_build_id_table(struct list_head *head);
+int sysfs__read_build_id(const char *filename, void *bf, size_t size);
+bool dsos__read_build_ids(void);
 int build_id__sprintf(u8 *self, int len, char *bf);
 
-int load_kernel(symbol_filter_t filter);
+size_t kernel_maps__fprintf(FILE *fp);
 
-void symbol__init(unsigned int priv_size);
+int symbol__init(struct symbol_conf *conf);
 
-extern struct list_head dsos;
-extern struct map *kernel_map;
+struct map_groups;
+struct map_groups *kmaps;
+extern struct list_head dsos__user, dsos__kernel;
 extern struct dso *vdso;
-extern const char *vmlinux_name;
-extern int   modules;
 #endif /* __PERF_SYMBOL */