perf top: Improve the autosizing of column lenghts

[safe/jmp/linux-2.6] / tools / perf / util / symbol.h

diff --git a/tools/perf/util/symbol.h b/tools/perf/util/symbol.h
index 0a34a54..f30a374 100644 (file)
--- a/tools/perf/util/symbol.h
+++ b/tools/perf/util/symbol.h
@@ -8,6 +8,8 @@
 #include <linux/rbtree.h>
 #include "event.h"
 
+#define DEBUG_CACHE_DIR ".debug"
+
 #ifdef HAVE_CPLUS_DEMANGLE
 extern char *cplus_demangle(const char *, int);
 
@@ -49,53 +51,122 @@ struct symbol {
        char            name[0];
 };
 
-extern unsigned int symbol__priv_size;
+void symbol__delete(struct symbol *self);
+
+struct strlist;
+
+struct symbol_conf {
+       unsigned short  priv_size;
+       bool            try_vmlinux_path,
+                       use_modules,
+                       sort_by_name,
+                       show_nr_samples,
+                       use_callchain,
+                       exclude_other,
+                       full_paths;
+       const char      *vmlinux_name,
+                       *field_sep;
+       char            *dso_list_str,
+                       *comm_list_str,
+                       *sym_list_str,
+                       *col_width_list_str;
+       struct strlist  *dso_list,
+                       *comm_list,
+                       *sym_list;
+};
+
+extern struct symbol_conf symbol_conf;
 
 static inline void *symbol__priv(struct symbol *self)
 {
-       return ((void *)self) - symbol__priv_size;
+       return ((void *)self) - symbol_conf.priv_size;
 }
 
+struct ref_reloc_sym {
+       const char      *name;
+       u64             addr;
+       u64             unrelocated_addr;
+};
+
+struct addr_location {
+       struct thread *thread;
+       struct map    *map;
+       struct symbol *sym;
+       u64           addr;
+       char          level;
+       bool          filtered;
+};
+
 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];
        u8               adjust_symbols:1;
        u8               slen_calculated:1;
-       u8               loaded:1;
        u8               has_build_id:1;
+       u8               kernel:1;
+       u8               hit:1;
        unsigned char    origin;
+       u8               sorted_by_name;
+       u8               loaded;
        u8               build_id[BUILD_ID_SIZE];
        const char       *short_name;
        char             *long_name;
+       u16              long_name_len;
+       u16              short_name_len;
        char             name[0];
 };
 
 struct dso *dso__new(const char *name);
+struct dso *dso__new_kernel(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);
+
+static inline void dso__set_loaded(struct dso *self, enum map_type type)
+{
+       self->loaded |= (1 << type);
+}
+
+void dso__sort_by_name(struct dso *self, enum map_type type);
+
+extern struct list_head dsos__user, dsos__kernel;
+
+struct dso *__dsos__findnew(struct list_head *head, const char *name);
+
+static inline struct dso *dsos__findnew(const char *name)
+{
+       return __dsos__findnew(&dsos__user, name);
+}
 
-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);
+int dso__load_vmlinux_path(struct dso *self, struct map *map,
+                          symbol_filter_t filter);
+int dso__load_kallsyms(struct dso *self, const char *filename, struct map *map,
+                      symbol_filter_t filter);
 void dsos__fprintf(FILE *fp);
+size_t dsos__fprintf_buildid(FILE *fp, bool with_hits);
 
-size_t dso__fprintf(struct dso *self, FILE *fp);
+size_t dso__fprintf_buildid(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_long_name(struct dso *self, char *name);
 void dso__set_build_id(struct dso *self, void *build_id);
+void dso__read_running_kernel_build_id(struct dso *self);
+struct symbol *dso__find_symbol(struct dso *self, enum map_type type, u64 addr);
+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 build_id__sprintf(u8 *self, int len, char *bf);
-
-int load_kernel(symbol_filter_t filter);
+int sysfs__read_build_id(const char *filename, void *bf, size_t size);
+bool dsos__read_build_ids(bool with_hits);
+int build_id__sprintf(const u8 *self, int len, char *bf);
+int kallsyms__parse(const char *filename, void *arg,
+                   int (*process_symbol)(void *arg, const char *name,
+                                         char type, u64 start));
 
-void symbol__init(unsigned int priv_size);
+int symbol__init(void);
+bool symbol_type__is_a(char symbol_type, enum map_type map_type);
 
-extern struct list_head dsos;
-extern struct map *kernel_map;
-extern struct dso *vdso;
-extern const char *vmlinux_name;
-extern int   modules;
 #endif /* __PERF_SYMBOL */