Commit 8efc4f05 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

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 <adrian.hunter@intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: https://lkml.kernel.org/n/tip-59gmq4kg1r68ou1wknyjl78x@git.kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 20419d3a

tools/perf/arch/x86/util/event.c

+1 −1
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -594,28 +594,20 @@ void map_groups__insert(struct map_groups *mg, struct map *map) 


static void __maps__purge(struct maps *maps)

{

	struct rb_root *root = &maps->entries;

	struct rb_node *next = rb_first(root);

	struct map *pos, *next;



	while (next) {

		struct map *pos = rb_entry(next, struct map, rb_node);



		next = rb_next(&pos->rb_node);

		rb_erase_init(&pos->rb_node, root);

	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 rb_root *root = &maps->names;

	struct rb_node *next = rb_first(root);



	while (next) {

		struct map *pos = rb_entry(next, struct map, rb_node_name);

	struct map *pos, *next;



		next = rb_next(&pos->rb_node_name);

		rb_erase_init(&pos->rb_node_name, root);

	maps__for_each_entry_by_name_safe(maps, pos, next) {

		rb_erase_init(&pos->rb_node_name,  &maps->names);

		map__put(pos);

	}

}
@@ -687,13 +679,11 @@ struct symbol *maps__find_symbol_by_name(struct maps *maps, const char *name, 
					 struct map **mapp)

{

	struct symbol *sym;

	struct rb_node *nd;

	struct map *pos;



	down_read(&maps->lock);



	for (nd = rb_first(&maps->entries); nd; nd = rb_next(nd)) {

		struct map *pos = rb_entry(nd, struct map, rb_node);



	maps__for_each_entry(maps, pos) {

		sym = map__find_symbol_by_name(pos, name);



		if (sym == NULL)
@@ -739,12 +729,11 @@ int map_groups__find_ams(struct addr_map_symbol *ams) 
static size_t maps__fprintf(struct maps *maps, FILE *fp)

{

	size_t printed = 0;

	struct rb_node *nd;

	struct map *pos;



	down_read(&maps->lock);



	for (nd = rb_first(&maps->entries); nd; nd = rb_next(nd)) {

		struct map *pos = rb_entry(nd, struct map, rb_node);

	maps__for_each_entry(maps, pos) {

		printed += fprintf(fp, "Map:");

		printed += map__fprintf(pos, fp);

		if (verbose > 2) {
@@ -889,7 +878,7 @@ int map_groups__clone(struct thread *thread, struct map_groups *parent) 


	down_read(&maps->lock);



	for (map = maps__first(maps); map; map = map__next(map)) {

	maps__for_each_entry(maps, map) {

		struct map *new = map__clone(map);

		if (new == NULL)

			goto out_unlock;
@@ -1021,6 +1010,29 @@ 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)

CRA Git | Maintained and supported by SUSTech CRA and CCSE