diff options
author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2009-11-27 13:29:23 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-11-27 14:22:02 -0500 |
commit | 1ed091c45ae33b2179d387573c3fe3f3b4adf60a (patch) | |
tree | d2b689de158e5a11673b5f0d08b491d243768138 /tools/perf/util/thread.h | |
parent | 62daacb51a2bf8480e6f6b3696b03f102fc15eb0 (diff) |
perf tools: Consolidate symbol resolving across all tools
Now we have a very high level routine for simple tools to
process IP sample events:
int event__preprocess_sample(const event_t *self,
struct addr_location *al,
symbol_filter_t filter)
It receives the event itself and will insert new threads in the
global threads list and resolve the map and symbol, filling all
this info into the new addr_location struct, so that tools like
annotate and report can further process the event by creating
hist_entries in their specific way (with or without callgraphs,
etc).
It in turn uses the new next layer function:
void thread__find_addr_location(struct thread *self, u8 cpumode,
enum map_type type, u64 addr,
struct addr_location *al,
symbol_filter_t filter)
This one will, given a thread (userspace or the kernel kthread
one), will find the given type (MAP__FUNCTION now, MAP__VARIABLE
too in the near future) at the given cpumode, taking vdsos into
account (userspace hit, but kernel symbol) and will fill all
these details in the addr_location given.
Tools that need a more compact API for plain function
resolution, like 'kmem', can use this other one:
struct symbol *thread__find_function(struct thread *self, u64 addr,
symbol_filter_t filter)
So, to resolve a kernel symbol, that is all the 'kmem' tool
needs, its just a matter of calling:
sym = thread__find_function(kthread, addr, NULL);
The 'filter' parameter is needed because we do lazy
parsing/loading of ELF symtabs or /proc/kallsyms.
With this we remove more code duplication all around, which is
always good, huh? :-)
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Frédéric Weisbecker <fweisbec@gmail.com>
Cc: John Kacur <jkacur@redhat.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-12-git-send-email-acme@infradead.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'tools/perf/util/thread.h')
-rw-r--r-- | tools/perf/util/thread.h | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/tools/perf/util/thread.h b/tools/perf/util/thread.h index 59b0d9b577d6..686d6e914d9e 100644 --- a/tools/perf/util/thread.h +++ b/tools/perf/util/thread.h | |||
@@ -27,19 +27,30 @@ size_t thread__fprintf_maps(struct thread *self, FILE *fp); | |||
27 | size_t threads__fprintf(FILE *fp); | 27 | size_t threads__fprintf(FILE *fp); |
28 | 28 | ||
29 | void maps__insert(struct rb_root *maps, struct map *map); | 29 | void maps__insert(struct rb_root *maps, struct map *map); |
30 | struct map *maps__find(struct rb_root *maps, u64 ip); | 30 | struct map *maps__find(struct rb_root *maps, u64 addr); |
31 | |||
32 | struct symbol *kernel_maps__find_function(const u64 ip, struct map **mapp, | ||
33 | symbol_filter_t filter); | ||
34 | 31 | ||
35 | static inline struct map *thread__find_map(struct thread *self, | 32 | static inline struct map *thread__find_map(struct thread *self, |
36 | enum map_type type, u64 ip) | 33 | enum map_type type, u64 addr) |
37 | { | 34 | { |
38 | return self ? maps__find(&self->maps[type], ip) : NULL; | 35 | return self ? maps__find(&self->maps[type], addr) : NULL; |
39 | } | 36 | } |
40 | 37 | ||
41 | static inline void __thread__insert_map(struct thread *self, struct map *map) | 38 | static inline void __thread__insert_map(struct thread *self, struct map *map) |
42 | { | 39 | { |
43 | maps__insert(&self->maps[map->type], map); | 40 | maps__insert(&self->maps[map->type], map); |
44 | } | 41 | } |
42 | |||
43 | void thread__find_addr_location(struct thread *self, u8 cpumode, | ||
44 | enum map_type type, u64 addr, | ||
45 | struct addr_location *al, | ||
46 | symbol_filter_t filter); | ||
47 | struct symbol *thread__find_symbol(struct thread *self, | ||
48 | enum map_type type, u64 addr, | ||
49 | symbol_filter_t filter); | ||
50 | |||
51 | static inline struct symbol * | ||
52 | thread__find_function(struct thread *self, u64 addr, symbol_filter_t filter) | ||
53 | { | ||
54 | return thread__find_symbol(self, MAP__FUNCTION, addr, filter); | ||
55 | } | ||
45 | #endif /* __PERF_THREAD_H */ | 56 | #endif /* __PERF_THREAD_H */ |