perf maps: Add for_each_entry()/_safe() iterators
A message that is not in the archive (sent off-list or not yet received): [email protected]
The following commit has been merged into the perf/core branch of tip:
Commit-ID: 8efc4f05685dae2da1d21973eba5e59e7863c77f Gitweb: https://git.kernel.org/tip/8efc4f05685dae2da1d21973eba5e59e7863c77f Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Mon, 28 Oct 2019 11:31:38 -03:00 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitterDate: Wed, 06 Nov 2019 15:49:25 -03:00
perf maps: Add for_each_entry()/_safe() iterators
To reduce boilerplate, provide a more compact form using an idiom present in other trees of data structures.
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/arch/x86/util/event.c | 2 +- tools/perf/builtin-report.c | 6 +-- tools/perf/tests/vmlinux-kallsyms.c | 6 +-- tools/perf/util/machine.c | 2 +- tools/perf/util/map.c | 56 +++++++++++++++++----------- tools/perf/util/map_groups.h | 15 ++++++++- tools/perf/util/probe-event.c | 2 +- tools/perf/util/symbol.c | 16 +++----- tools/perf/util/synthetic-events.c | 2 +- tools/perf/util/thread.c | 2 +- 10 files changed, 65 insertions(+), 44 deletions(-)
tools/perf/arch/x86/util/event.c +1 -1
@@ -29,7 +29,7 @@ int perf_event__synthesize_extra_kmaps(struct perf_tool *tool,return -1 ; } -for (pos =maps__first (maps); pos; pos =map__next (pos)) { +maps__for_each_entry (maps, pos) {struct kmap *kmap;size_t size;
tools/perf/builtin-report.c +2 -4
@@ -727,11 +727,9 @@ static struct task *tasks_list(struct task *task, struct machine *machine)static size_t maps__fprintf_task (struct maps *maps,int indent,FILE *fp) {size_t printed =0 ; -struct rb_node *nd; - -for (nd =rb_first (&maps->entries); nd; nd =rb_next (nd)) { - struct map *map = rb_entry(nd, struct map, rb_node); +struct map *map; +maps__for_each_entry (maps, map) { printed += fprintf(fp, "%*s %" PRIx64 "-%" PRIx64 " %c%c%c%c %08" PRIx64 " %" PRIu64 " %s\n", indent, "", map->start, map->end, map->prot & PROT_READ ? 'r' : '-',
tools/perf/tests/vmlinux-kallsyms.c +3 -3
@@ -182,7 +182,7 @@ next_pair: header_printed = false; -for (map =maps__first (maps); map; map =map__next (map)) { +maps__for_each_entry (maps, map) {struct map */* * If it is the kernel, kallsyms is always "[kernel.kallsyms]", while
@@ -207,7 +207,7 @@ next_pair: header_printed = false; -for (map =maps__first (maps); map; map =map__next (map)) { +maps__for_each_entry (maps, map) {struct map *pair; mem_start = vmlinux_map->unmap_ip (vmlinux_map, map->start);
@@ -237,7 +237,7 @@ next_pair: maps =machine__kernel_maps (&kallsyms); -for (map =maps__first (maps); map; map =map__next (map)) { +maps__for_each_entry (maps, map) {if (!map->priv) {if (!header_printed) {pr_info ("WARN: Maps only in kallsyms:\n" );
tools/perf/util/machine.c +1 -1
@@ -1057,7 +1057,7 @@ int machine__map_x86_64_entry_trampolines(struct machine *machine,* In the vmlinux case, pgoff is a virtual address which must now be * mapped to a vmlinux offset. */ -for (map =maps__first (maps); map; map =map__next (map)) { +maps__for_each_entry (maps, map) {struct kmap *kmap =__map__kmap (map);struct map *dest_map;
tools/perf/util/map.c +34 -22
100 lines not on this page · raw message
tools/perf/util/map_groups.h +15 -0
@@ -25,7 +25,22 @@ 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); + +#define maps__for_each_entry (maps, map) \ + for (map = maps__first(maps); map; map = map__next(map)) + +#define maps__for_each_entry_safe (maps, map, next) \ + 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;
tools/perf/util/probe-event.c +1 -1
@@ -153,7 +153,7 @@ static struct map *kernel_get_module_map(const char *module)return map__get (pos); } -for (pos =maps__first (maps); pos; pos =map__next (pos)) { +maps__for_each_entry (maps, pos) {/* short_name is "[module]" */ if (strncmp(pos->dso->short_name + 1, module, pos->dso->short_name_len - 2) == 0 &&
tools/perf/util/symbol.c +6 -10
@@ -242,28 +242,24 @@ void symbols__fixup_end(struct rb_root_cached *symbols)void map_groups__fixup_end (struct map_groups *mg) {struct maps *maps = &mg->maps; -struct map *next, *curr; +struct map *prev =NULL , *curr;down_write (&maps->lock); - curr =maps__first (maps); -if (curr ==NULL ) - goto out_unlock; +maps__for_each_entry (maps, curr) { +if (prev !=NULL && !prev->end) + prev->end = curr->start; -for (next =map__next (curr); next; next =map__next (curr)) { -if (!curr->end) - curr->end = next->start; - curr = next; + prev = curr; }/* * We still haven't the actual symbols, so guess the * last map final address. */ -if (!curr->end) +if (curr && !curr->end) curr->end = ~0ULL ; -out_unlock:up_write (&maps->lock); }
tools/perf/util/synthetic-events.c +1 -1
@@ -438,7 +438,7 @@ int perf_event__synthesize_modules(struct perf_tool *tool, perf_event__handler_telse event->header.misc =PERF_RECORD_MISC_GUEST_KERNEL ; -for (pos =maps__first (maps); pos; pos =map__next (pos)) { +maps__for_each_entry (maps, pos) {size_t size;if (!__map__is_kmodule (pos))
tools/perf/util/thread.c +1 -1
@@ -350,7 +350,7 @@ static int __thread__prepare_access(struct thread *thread)down_read (&maps->lock); -for (map =maps__first (maps); map; map =map__next (map)) { +maps__for_each_entry (maps, map) { err =unwind__prepare_access (thread->mg, map, &initialized);if (err || initialized)break ;