perf maps: Introduce maps__find_symbol_by_name()
tip-bot for Arnaldo Carvalho de Melo
merge botCommit-ID: b7f9ff5654d53fa47e0b5ff20f834f3e7a611846 Gitweb: http://git.kernel.org/tip/b7f9ff5654d53fa47e0b5ff20f834f3e7a611846 Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Tue, 29 Sep 2015 17:34:46 -0300 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Wed, 30 Sep 2015 18:34:25 -0300
perf maps: Introduce maps__find_symbol_by_name()
Out of map_groups__find_symbol_by_name(), so that we can turn this later one first into a call to maps__find_symbol_by_name(MAP__FUNCTION) + MAP__VARIABLE, and then to just one call, we'll merge MAP__FUNCTION with MAP__VARIABLE maps, to simplify the code.
Cc Adrian Hunter <[email protected]>
Cc Borislav Petkov <[email protected]>
Cc David Ahern <[email protected]>
Cc Frederic Weisbecker <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Namhyung Kim <[email protected]>
Cc Stephane Eranian <[email protected]>
Cc Wang Nan <[email protected]>
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
--- tools/perf/util/map.c | 19 +++++++++++++------ tools/perf/util/map.h | 2 ++ 2 files changed, 15 insertions(+), 6 deletions(-)
tools/perf/util/map.c +13 -6
@@ -553,13 +553,9 @@ struct symbol *map_groups__find_symbol(struct map_groups *mg,return NULL ; } -struct symbol *map_groups__find_symbol_by_name (struct map_groups *mg, -enum map_type type, -const char *name, -struct map **mapp, -symbol_filter_t filter) +struct symbol *maps__find_symbol_by_name (struct maps *maps,const char *name, +struct map **mapp,symbol_filter_t filter) { -struct maps *maps = &mg->maps[type];struct symbol *sym;struct rb_node *nd;
@@ -583,6 +579,17 @@ out:return sym; } +struct symbol *map_groups__find_symbol_by_name (struct map_groups *mg, +enum map_type type, +const char *name, +struct map **mapp, +symbol_filter_t filter) +{ +struct symbol *sym =maps__find_symbol_by_name (&mg->maps[type], name, mapp, filter); + +return sym; +} +int map_groups__find_ams (struct addr_map_symbol *ams,symbol_filter_t filter) {if (ams->addr < ams->map->start || ams->addr >= ams->map->end) {
tools/perf/util/map.h +2 -0
@@ -190,6 +190,8 @@ void maps__remove(struct maps *maps, struct map *map);struct map *maps__find (struct maps *maps,u64 addr);struct map *maps__first (struct maps *maps);struct map *map__next (struct map *map); +struct symbol *maps__find_symbol_by_name (struct maps *maps,const char *name, +struct map **mapp,symbol_filter_t filter);void map_groups__init (struct map_groups *mg,struct machine *machine);void map_groups__exit (struct map_groups *mg); int map_groups__clone(struct map_groups *mg,