perf map: Allow map__next() to receive a NULL arg
The following commit has been merged into the perf/core branch of tip:
Commit-ID: 20419d3a5bc0a278ed7e2ee54943674004411933 Gitweb: https://git.kernel.org/tip/20419d3a5bc0a278ed7e2ee54943674004411933 Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Mon, 28 Oct 2019 11:50:12 -03:00 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitterDate: Wed, 06 Nov 2019 15:43:06 -03:00
perf map: Allow map__next() to receive a NULL arg
Just like free(), return NULL in that case, will simplify the for_each_entry_safe() iterators.
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 | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
tools/perf/util/map.c +6 -1
@@ -1007,7 +1007,7 @@ struct map *maps__first(struct maps *maps)return NULL ; } -struct map *map__next (struct map *map) +static struct map *__map__next (struct map *map) {struct rb_node *next =rb_next (&map->rb_node);
@@ -1016,6 +1016,11 @@ struct map *map__next(struct map *map)return NULL ; } +struct map *map__next (struct map *map) +{ +return map ?__map__next (map) :NULL ; +} +struct kmap *__map__kmap (struct map *map) {if (!map->dso || !map->dso->kernel)