perf tools: Pass machine to vdso__dso_findnew()

This is preparation for removing the global variables used in vdso.c and
thereby fixing the lifetime of the VDSO temporary file.

Reviewed-by: Jiri Olsa <jolsa@redhat.com>
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/1406035081-14301-45-git-send-email-adrian.hunter@intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c
index cfc691000f13a24bf93704f63dbdc5fc219682df..a25f3ee1b5b37b2b5de8ef68e3531c8c9be5ff7a 100644 (file)
--- a/tools/perf/util/machine.c
+++ b/tools/perf/util/machine.c
@@ -1095,7 +1095,7 @@ int machine__process_mmap2_event(struct machine *machine,
        else
                type = MAP__FUNCTION;
 
-       map = map__new(&machine->user_dsos, event->mmap2.start,
+       map = map__new(machine, event->mmap2.start,
                        event->mmap2.len, event->mmap2.pgoff,
                        event->mmap2.pid, event->mmap2.maj,
                        event->mmap2.min, event->mmap2.ino,
@@ -1145,7 +1145,7 @@ int machine__process_mmap_event(struct machine *machine, union perf_event *event
        else
                type = MAP__FUNCTION;
 
-       map = map__new(&machine->user_dsos, event->mmap.start,
+       map = map__new(machine, event->mmap.start,
                        event->mmap.len, event->mmap.pgoff,
                        event->mmap.pid, 0, 0, 0, 0, 0, 0,
                        event->mmap.filename,

diff --git a/tools/perf/util/map.c b/tools/perf/util/map.c
index 845f627e45f4c8fa47ba3ff75e64a59cdba5f1f8..dffc8dce604676ec3146c75b427e3676f5db14b0 100644 (file)
--- a/tools/perf/util/map.c
+++ b/tools/perf/util/map.c
@@ -13,6 +13,7 @@
 #include "build-id.h"
 #include "util.h"
 #include "debug.h"
+#include "machine.h"
 #include <linux/string.h>
 
 const char *map_type__name[MAP__NR_TYPES] = {
@@ -137,7 +138,7 @@ void map__init(struct map *map, enum map_type type,
        map->erange_warned = false;
 }
 
-struct map *map__new(struct list_head *dsos__list, u64 start, u64 len,
+struct map *map__new(struct machine *machine, u64 start, u64 len,
                     u64 pgoff, u32 pid, u32 d_maj, u32 d_min, u64 ino,
                     u64 ino_gen, u32 prot, u32 flags, char *filename,
                     enum map_type type)
@@ -173,9 +174,9 @@ struct map *map__new(struct list_head *dsos__list, u64 start, u64 len,
 
                if (vdso) {
                        pgoff = 0;
-                       dso = vdso__dso_findnew(dsos__list);
+                       dso = vdso__dso_findnew(machine);
                } else
-                       dso = __dsos__findnew(dsos__list, filename);
+                       dso = __dsos__findnew(&machine->user_dsos, filename);
 
                if (dso == NULL)
                        goto out_delete;

diff --git a/tools/perf/util/map.h b/tools/perf/util/map.h
index 22d13a2195904dea811d5cd5756be77f3be8270b..a95e677f16e966b04869641a95ed04218b3fd6e6 100644 (file)
--- a/tools/perf/util/map.h
+++ b/tools/perf/util/map.h
@@ -119,7 +119,7 @@ typedef int (*symbol_filter_t)(struct map *map, struct symbol *sym);
 
 void map__init(struct map *map, enum map_type type,
               u64 start, u64 end, u64 pgoff, struct dso *dso);
-struct map *map__new(struct list_head *dsos__list, u64 start, u64 len,
+struct map *map__new(struct machine *machine, u64 start, u64 len,
                     u64 pgoff, u32 pid, u32 d_maj, u32 d_min, u64 ino,
                     u64 ino_gen, u32 prot, u32 flags,
                     char *filename, enum map_type type);

diff --git a/tools/perf/util/vdso.c b/tools/perf/util/vdso.c
index 290582452da36580a5944ffcc278945e11641f46..da5ba4da2bd2aee42e94c20de2659f65f7b40709 100644 (file)
--- a/tools/perf/util/vdso.c
+++ b/tools/perf/util/vdso.c
@@ -11,6 +11,7 @@
 #include "vdso.h"
 #include "util.h"
 #include "symbol.h"
+#include "machine.h"
 #include "linux/string.h"
 #include "debug.h"
 
@@ -90,9 +91,9 @@ void vdso__exit(void)
                unlink(vdso_file);
 }
 
-struct dso *vdso__dso_findnew(struct list_head *head)
+struct dso *vdso__dso_findnew(struct machine *machine)
 {
-       struct dso *dso = dsos__find(head, VDSO__MAP_NAME, true);
+       struct dso *dso = dsos__find(&machine->user_dsos, VDSO__MAP_NAME, true);
 
        if (!dso) {
                char *file;
@@ -103,7 +104,7 @@ struct dso *vdso__dso_findnew(struct list_head *head)
 
                dso = dso__new(VDSO__MAP_NAME);
                if (dso != NULL) {
-                       dsos__add(head, dso);
+                       dsos__add(&machine->user_dsos, dso);
                        dso__set_long_name(dso, file, false);
                }
        }

diff --git a/tools/perf/util/vdso.h b/tools/perf/util/vdso.h
index 0f76e7caf6f8e1357e2358736bcb779da7449d1e..9ab0738b6752b1fb8c9aafdd677a84c6cda11145 100644 (file)
--- a/tools/perf/util/vdso.h
+++ b/tools/perf/util/vdso.h
@@ -12,7 +12,9 @@ static inline bool is_vdso_map(const char *filename)
        return !strcmp(filename, VDSO__MAP_NAME);
 }
 
-struct dso *vdso__dso_findnew(struct list_head *head);
+struct machine;
+
+struct dso *vdso__dso_findnew(struct machine *machine);
 void vdso__exit(void);
 
 #endif /* __PERF_VDSO__ */