1 files changed, 31 insertions, 16 deletions

diff --git a/tools/perf/util/map.c b/tools/perf/util/map.c
index 25c571f4cba6..31b8905dd863 100644
--- a/tools/perf/util/map.c
+++ b/tools/perf/util/map.c
@@ -12,6 +12,8 @@
 #include "vdso.h"
 #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] = {
@@ -136,10 +138,10 @@ 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)
+                     enum map_type type, struct thread *thread)
 {
         struct map *map = malloc(sizeof(*map));
 
@@ -172,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, thread);
                 } else
-                        dso = __dsos__findnew(dsos__list, filename);
+                        dso = __dsos__findnew(&machine->user_dsos, filename);
 
                 if (dso == NULL)
                         goto out_delete;
@@ -454,6 +456,20 @@ void map_groups__exit(struct map_groups *mg)
         }
 }
 
+bool map_groups__empty(struct map_groups *mg)
+{
+        int i;
+
+        for (i = 0; i < MAP__NR_TYPES; ++i) {
+                if (maps__first(&mg->maps[i]))
+                        return false;
+                if (!list_empty(&mg->removed_maps[i]))
+                        return false;
+        }
+
+        return true;
+}
+
 struct map_groups *map_groups__new(void)
 {
         struct map_groups *mg = malloc(sizeof(*mg));
@@ -554,8 +570,8 @@ int map_groups__find_ams(struct addr_map_symbol *ams, symbol_filter_t filter)
         return ams->sym ? 0 : -1;
 }
 
-size_t __map_groups__fprintf_maps(struct map_groups *mg,
-                                  enum map_type type, int verbose, FILE *fp)
+size_t __map_groups__fprintf_maps(struct map_groups *mg, enum map_type type,
+                                  FILE *fp)
 {
         size_t printed = fprintf(fp, "%s:\n", map_type__name[type]);
         struct rb_node *nd;
@@ -573,17 +589,16 @@ size_t __map_groups__fprintf_maps(struct map_groups *mg,
         return printed;
 }
 
-size_t map_groups__fprintf_maps(struct map_groups *mg, int verbose, FILE *fp)
+static size_t map_groups__fprintf_maps(struct map_groups *mg, FILE *fp)
 {
         size_t printed = 0, i;
         for (i = 0; i < MAP__NR_TYPES; ++i)
-                printed += __map_groups__fprintf_maps(mg, i, verbose, fp);
+                printed += __map_groups__fprintf_maps(mg, i, fp);
         return printed;
 }
 
 static size_t __map_groups__fprintf_removed_maps(struct map_groups *mg,
-                                                 enum map_type type,
-                                                 int verbose, FILE *fp)
+                                                 enum map_type type, FILE *fp)
 {
         struct map *pos;
         size_t printed = 0;
@@ -600,23 +615,23 @@ static size_t __map_groups__fprintf_removed_maps(struct map_groups *mg,
 }
 
 static size_t map_groups__fprintf_removed_maps(struct map_groups *mg,
-                                               int verbose, FILE *fp)
+                                               FILE *fp)
 {
         size_t printed = 0, i;
         for (i = 0; i < MAP__NR_TYPES; ++i)
-                printed += __map_groups__fprintf_removed_maps(mg, i, verbose, fp);
+                printed += __map_groups__fprintf_removed_maps(mg, i, fp);
         return printed;
 }
 
-size_t map_groups__fprintf(struct map_groups *mg, int verbose, FILE *fp)
+size_t map_groups__fprintf(struct map_groups *mg, FILE *fp)
 {
-        size_t printed = map_groups__fprintf_maps(mg, verbose, fp);
+        size_t printed = map_groups__fprintf_maps(mg, fp);
         printed += fprintf(fp, "Removed maps:\n");
-        return printed + map_groups__fprintf_removed_maps(mg, verbose, fp);
+        return printed + map_groups__fprintf_removed_maps(mg, fp);
 }
 
 int map_groups__fixup_overlappings(struct map_groups *mg, struct map *map,
-                                   int verbose, FILE *fp)
+                                   FILE *fp)
 {
         struct rb_root *root = &mg->maps[map->type];
         struct rb_node *next = rb_first(root);