perf session: Adopt resolve_callchain

This is really a generic library routine, so declutter
builtin-report.c a bit by moving it to the library.

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Frédéric Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
LKML-Reference: <1260807780-19377-1-git-send-email-acme@infradead.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 2 insertions, 60 deletions

diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c
index 854427f0e57e..5141cdccbb65 100644
--- a/tools/perf/builtin-report.c
+++ b/tools/perf/builtin-report.c
@@ -407,64 +407,6 @@ static int thread__set_comm_adjust(struct thread *self, const char *comm)
         return 0;
 }
 
-static int call__match(struct symbol *sym)
-{
-        if (sym->name && !regexec(&parent_regex, sym->name, 0, NULL, 0))
-                return 1;
-
-        return 0;
-}
-
-static struct symbol **resolve_callchain(struct thread *thread,
-                                         struct perf_session *session,
-                                         struct ip_callchain *chain,
-                                         struct symbol **parent)
-{
-        u8 cpumode = PERF_RECORD_MISC_USER;
-        struct symbol **syms = NULL;
-        unsigned int i;
-
-        if (session->use_callchain) {
-                syms = calloc(chain->nr, sizeof(*syms));
-                if (!syms) {
-                        fprintf(stderr, "Can't allocate memory for symbols\n");
-                        exit(-1);
-                }
-        }
-
-        for (i = 0; i < chain->nr; i++) {
-                u64 ip = chain->ips[i];
-                struct addr_location al;
-
-                if (ip >= PERF_CONTEXT_MAX) {
-                        switch (ip) {
-                        case PERF_CONTEXT_HV:
-                                cpumode = PERF_RECORD_MISC_HYPERVISOR;  break;
-                        case PERF_CONTEXT_KERNEL:
-                                cpumode = PERF_RECORD_MISC_KERNEL;      break;
-                        case PERF_CONTEXT_USER:
-                                cpumode = PERF_RECORD_MISC_USER;        break;
-                        default:
-                                break;
-                        }
-                        continue;
-                }
-
-                thread__find_addr_location(thread, session, cpumode,
-                                           MAP__FUNCTION, ip, &al, NULL);
-                if (al.sym != NULL) {
-                        if (sort__has_parent && !*parent &&
-                            call__match(al.sym))
-                                *parent = al.sym;
-                        if (!session->use_callchain)
-                                break;
-                        syms[i] = al.sym;
-                }
-        }
-
-        return syms;
-}
-
 /*
  * collect histogram counts
  */
@@ -478,8 +420,8 @@ static int perf_session__add_hist_entry(struct perf_session *self,
         struct hist_entry *he;
 
         if ((sort__has_parent || self->use_callchain) && chain)
-                syms = resolve_callchain(al->thread, self, chain, &parent);
-
+                syms = perf_session__resolve_callchain(self, al->thread,
+                                                       chain, &parent);
         he = __perf_session__add_hist_entry(self, al, parent, count, &hit);
         if (he == NULL)
                 return -ENOMEM;