perf maps: Purge the entries from maps->names in __maps__purge()
The following commit has been merged into the perf/core branch of tip:
Commit-ID: bcb8af5c46e452018de9b58db1fd0ffd94b5d96c Gitweb: https://git.kernel.org/tip/bcb8af5c46e452018de9b58db1fd0ffd94b5d96c Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Wed, 13 Nov 2019 16:06:28 -03:00 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitterDate: Wed, 13 Nov 2019 16:06:28 -03:00
perf maps: Purge the entries from maps->names in __maps__purge()
No need to iterate via the ->names rbtree, as all the entries there as in maps->entries as well, reuse __maps__purge() for that.
Doing it this way we can kill maps__for_each_entry_by_name(), maps__for_each_entry_by_name_safe(), maps__{first,next}_by_name().
Cc Adrian Hunter <[email protected]>
Cc Andi Kleen <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Namhyung Kim <[email protected]>
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
--- tools/perf/util/map.c | 34 +--------------------------------- tools/perf/util/map_groups.h | 8 -------- 2 files changed, 1 insertion(+), 41 deletions(-)
tools/perf/util/map.c +1 -33
@@ -589,15 +589,7 @@ static void __maps__purge(struct maps *maps)maps__for_each_entry_safe (maps, pos, next) {rb_erase_init (&pos->rb_node, &maps->entries);map__put (pos); - } -} - -static void __maps__purge_names (struct maps *maps) -{ -struct map *pos, *next; - -maps__for_each_entry_by_name_safe (maps, pos, next) { -rb_erase_init (&pos->rb_node_name, &maps->names); +rb_erase_init (&pos->rb_node_name, &maps->names);map__put (pos); } }
@@ -606,7 +598,6 @@ static void maps__exit(struct maps *maps) {down_write (&maps->lock);__maps__purge (maps); -__maps__purge_names (maps);up_write (&maps->lock); }
@@ -994,29 +985,6 @@ struct map *map__next(struct map *map)return map ?__map__next (map) :NULL ; } -struct map *maps__first_by_name (struct maps *maps) -{ -struct rb_node *first =rb_first (&maps->names); - -if (first) - return rb_entry(first, struct map, rb_node_name); -return NULL ; -} - -static struct map *__map__next_by_name (struct map *map) -{ -struct rb_node *next =rb_next (&map->rb_node_name); - -if (next) - return rb_entry(next, struct map, rb_node_name); -return NULL ; -} - -struct map *map__next_by_name (struct map *map) -{ -return map ?__map__next_by_name (map) :NULL ; -} -struct kmap *__map__kmap (struct map *map) {if (!map->dso || !map->dso->kernel)
tools/perf/util/map_groups.h +0 -8
@@ -33,14 +33,6 @@ struct map *map__next(struct map *map);for (map =maps__first (maps), next =map__next (map); map; map = next, next =map__next (map)) struct symbol *maps__find_symbol_by_name(struct maps *maps, const char *name, struct map **mapp); -struct map *maps__first_by_name (struct maps *maps); -struct map *map__next_by_name (struct map *map); - -#define maps__for_each_entry_by_name (maps, map) \ - for (map = maps__first_by_name(maps); map; map = map__next_by_name(map)) - -#define maps__for_each_entry_by_name_safe (maps, map, next) \ - for (map = maps__first_by_name(maps), next = map__next_by_name(map); map; map = next, next = map__next_by_name(map))struct map_groups {struct maps maps;