perf symbols: map_groups__find_symbol must return the map too

[firefly-linux-kernel-4.4.55.git] / tools / perf / util / map.c

diff --git a/tools/perf/util/map.c b/tools/perf/util/map.c
index e21f98001734a2dcc92c464244caa6e97633ee78..37913b241bdf1bca14fa13d4ec4ff3362e70b971 100644 (file)
--- a/tools/perf/util/map.c
+++ b/tools/perf/util/map.c
@@ -268,12 +268,38 @@ void map_groups__flush(struct map_groups *self)
 
 struct symbol *map_groups__find_symbol(struct map_groups *self,
                                       enum map_type type, u64 addr,
+                                      struct map **mapp,
                                       symbol_filter_t filter)
 {
        struct map *map = map_groups__find(self, type, addr);
 
-       if (map != NULL)
+       if (map != NULL) {
+               if (mapp != NULL)
+                       *mapp = map;
                return map__find_symbol(map, map->map_ip(map, addr), filter);
+       }
+
+       return NULL;
+}
+
+struct symbol *map_groups__find_symbol_by_name(struct map_groups *self,
+                                              enum map_type type,
+                                              const char *name,
+                                              struct map **mapp,
+                                              symbol_filter_t filter)
+{
+       struct rb_node *nd;
+
+       for (nd = rb_first(&self->maps[type]); nd; nd = rb_next(nd)) {
+               struct map *pos = rb_entry(nd, struct map, rb_node);
+               struct symbol *sym = map__find_symbol_by_name(pos, name, filter);
+
+               if (sym == NULL)
+                       continue;
+               if (mapp != NULL)
+                       *mapp = pos;
+               return sym;
+       }
 
        return NULL;
 }