1 files changed, 2 insertions, 180 deletions

diff --git a/tools/perf/util/map.c b/tools/perf/util/map.c
index 6109fa4d14cd..0328d45c4f2a 100644
--- a/tools/perf/util/map.c
+++ b/tools/perf/util/map.c
@@ -10,6 +10,7 @@
 #include "thread.h"
 #include "strlist.h"
 #include "vdso.h"
+#include "build-id.h"
 
 const char *map_type__name[MAP__NR_TYPES] = {
         [MAP__FUNCTION] = "Functions",
@@ -23,7 +24,7 @@ static inline int is_anon_memory(const char *filename)
 
 static inline int is_no_dso_memory(const char *filename)
 {
-        return !strcmp(filename, "[stack]") ||
+        return !strncmp(filename, "[stack", 6) ||
                !strcmp(filename, "[heap]");
 }
 
@@ -589,182 +590,3 @@ struct map *maps__find(struct rb_root *maps, u64 ip)
 
         return NULL;
 }
-
-int machine__init(struct machine *self, const char *root_dir, pid_t pid)
-{
-        map_groups__init(&self->kmaps);
-        RB_CLEAR_NODE(&self->rb_node);
-        INIT_LIST_HEAD(&self->user_dsos);
-        INIT_LIST_HEAD(&self->kernel_dsos);
-
-        self->threads = RB_ROOT;
-        INIT_LIST_HEAD(&self->dead_threads);
-        self->last_match = NULL;
-
-        self->kmaps.machine = self;
-        self->pid           = pid;
-        self->root_dir      = strdup(root_dir);
-        if (self->root_dir == NULL)
-                return -ENOMEM;
-
-        if (pid != HOST_KERNEL_ID) {
-                struct thread *thread = machine__findnew_thread(self, pid);
-                char comm[64];
-
-                if (thread == NULL)
-                        return -ENOMEM;
-
-                snprintf(comm, sizeof(comm), "[guest/%d]", pid);
-                thread__set_comm(thread, comm);
-        }
-
-        return 0;
-}
-
-static void dsos__delete(struct list_head *self)
-{
-        struct dso *pos, *n;
-
-        list_for_each_entry_safe(pos, n, self, node) {
-                list_del(&pos->node);
-                dso__delete(pos);
-        }
-}
-
-void machine__exit(struct machine *self)
-{
-        map_groups__exit(&self->kmaps);
-        dsos__delete(&self->user_dsos);
-        dsos__delete(&self->kernel_dsos);
-        free(self->root_dir);
-        self->root_dir = NULL;
-}
-
-void machine__delete(struct machine *self)
-{
-        machine__exit(self);
-        free(self);
-}
-
-struct machine *machines__add(struct rb_root *self, pid_t pid,
-                              const char *root_dir)
-{
-        struct rb_node **p = &self->rb_node;
-        struct rb_node *parent = NULL;
-        struct machine *pos, *machine = malloc(sizeof(*machine));
-
-        if (!machine)
-                return NULL;
-
-        if (machine__init(machine, root_dir, pid) != 0) {
-                free(machine);
-                return NULL;
-        }
-
-        while (*p != NULL) {
-                parent = *p;
-                pos = rb_entry(parent, struct machine, rb_node);
-                if (pid < pos->pid)
-                        p = &(*p)->rb_left;
-                else
-                        p = &(*p)->rb_right;
-        }
-
-        rb_link_node(&machine->rb_node, parent, p);
-        rb_insert_color(&machine->rb_node, self);
-
-        return machine;
-}
-
-struct machine *machines__find(struct rb_root *self, pid_t pid)
-{
-        struct rb_node **p = &self->rb_node;
-        struct rb_node *parent = NULL;
-        struct machine *machine;
-        struct machine *default_machine = NULL;
-
-        while (*p != NULL) {
-                parent = *p;
-                machine = rb_entry(parent, struct machine, rb_node);
-                if (pid < machine->pid)
-                        p = &(*p)->rb_left;
-                else if (pid > machine->pid)
-                        p = &(*p)->rb_right;
-                else
-                        return machine;
-                if (!machine->pid)
-                        default_machine = machine;
-        }
-
-        return default_machine;
-}
-
-struct machine *machines__findnew(struct rb_root *self, pid_t pid)
-{
-        char path[PATH_MAX];
-        const char *root_dir = "";
-        struct machine *machine = machines__find(self, pid);
-
-        if (machine && (machine->pid == pid))
-                goto out;
-
-        if ((pid != HOST_KERNEL_ID) &&
-            (pid != DEFAULT_GUEST_KERNEL_ID) &&
-            (symbol_conf.guestmount)) {
-                sprintf(path, "%s/%d", symbol_conf.guestmount, pid);
-                if (access(path, R_OK)) {
-                        static struct strlist *seen;
-
-                        if (!seen)
-                                seen = strlist__new(true, NULL);
-
-                        if (!strlist__has_entry(seen, path)) {
-                                pr_err("Can't access file %s\n", path);
-                                strlist__add(seen, path);
-                        }
-                        machine = NULL;
-                        goto out;
-                }
-                root_dir = path;
-        }
-
-        machine = machines__add(self, pid, root_dir);
-
-out:
-        return machine;
-}
-
-void machines__process(struct rb_root *self, machine__process_t process, void *data)
-{
-        struct rb_node *nd;
-
-        for (nd = rb_first(self); nd; nd = rb_next(nd)) {
-                struct machine *pos = rb_entry(nd, struct machine, rb_node);
-                process(pos, data);
-        }
-}
-
-char *machine__mmap_name(struct machine *self, char *bf, size_t size)
-{
-        if (machine__is_host(self))
-                snprintf(bf, size, "[%s]", "kernel.kallsyms");
-        else if (machine__is_default_guest(self))
-                snprintf(bf, size, "[%s]", "guest.kernel.kallsyms");
-        else
-                snprintf(bf, size, "[%s.%d]", "guest.kernel.kallsyms", self->pid);
-
-        return bf;
-}
-
-void machines__set_id_hdr_size(struct rb_root *machines, u16 id_hdr_size)
-{
-        struct rb_node *node;
-        struct machine *machine;
-
-        for (node = rb_first(machines); node; node = rb_next(node)) {
-                machine = rb_entry(node, struct machine, rb_node);
-                machine->id_hdr_size = id_hdr_size;
-        }
-
-        return;
-}