xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

perf maps: Add for_each_entry()/_safe() iterators

Browse Source 
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: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Arnaldo Carvalho de Melo
2019-10-28 11:31:38 -03:00
parent 20419d3a5b
commit 8efc4f0568
10 changed files with 65 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
tools/perf/util/map.c
View File

@@ -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);
struct map *pos, *next;
while (next) {
struct map *pos = rb_entry(next, struct map, rb_node_name);
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)