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>

1 files changed, 9 insertions, 35 deletions

diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c
index 7a3c0c7aad3d..e0a374d0e43a 100644
--- a/tools/perf/builtin-top.c
+++ b/tools/perf/builtin-top.c
@@ -929,55 +929,28 @@ static int symbol_filter(struct map *map, struct symbol *sym)
 static void event__process_sample(const event_t *self, int counter)
 {
         u64 ip = self->ip.ip;
-        struct map *map;
         struct sym_entry *syme;
-        struct symbol *sym;
+        struct addr_location al;
         u8 origin = self->header.misc & PERF_RECORD_MISC_CPUMODE_MASK;
 
         switch (origin) {
-        case PERF_RECORD_MISC_USER: {
-                struct thread *thread;
-
+        case PERF_RECORD_MISC_USER:
                 if (hide_user_symbols)
                         return;
-
-                thread = threads__findnew(self->ip.pid);
-                if (thread == NULL)
-                        return;
-
-                map = thread__find_map(thread, MAP__FUNCTION, ip);
-                if (map != NULL) {
-                        ip = map->map_ip(map, ip);
-                        sym = map__find_symbol(map, ip, symbol_filter);
-                        if (sym == NULL)
-                                return;
-                        userspace_samples++;
-                        break;
-                }
-        }
-                /*
-                 * If this is outside of all known maps,
-                 * and is a negative address, try to look it
-                 * up in the kernel dso, as it might be a
-                 * vsyscall or vdso (which executes in user-mode).
-                 */
-                if ((long long)ip >= 0)
-                        return;
-                /* Fall thru */
+                break;
         case PERF_RECORD_MISC_KERNEL:
                 if (hide_kernel_symbols)
                         return;
-
-                sym = kernel_maps__find_function(ip, &map, symbol_filter);
-                if (sym == NULL)
-                        return;
                 break;
         default:
                 return;
         }
 
-        syme = symbol__priv(sym);
+        if (event__preprocess_sample(self, &al, symbol_filter) < 0 ||
+            al.sym == NULL)
+                return;
 
+        syme = symbol__priv(al.sym);
         if (!syme->skip) {
                 syme->count[counter]++;
                 syme->origin = origin;
@@ -986,8 +959,9 @@ static void event__process_sample(const event_t *self, int counter)
                 if (list_empty(&syme->node) || !syme->node.next)
                         __list_insert_active_sym(syme);
                 pthread_mutex_unlock(&active_symbols_lock);
+                if (origin == PERF_RECORD_MISC_USER)
+                        ++userspace_samples;
                 ++samples;
-                return;
         }
 }