redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

perf map: Remove enum_type arg to map_groups__first() 

Only the symbol core needs to use that, so provide a __ variant for that
case, that will end up removed when we ditch the MAP__ split.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: https://lkml.kernel.org/n/tip-x29k9e1ohastsoqbilp3mguh@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
hifive-unleashed-5.1
Arnaldo Carvalho de Melo 2018-04-25 17:28:55 -03:00
parent a2f1c160fe
commit dce0478b5f
3 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/perf/util/map.h
View File

@ -225,11 +225,7 @@ static inline struct map *map_groups__find(struct map_groups *mg, u64 addr)
return __map_groups__find(mg, MAP__FUNCTION, addr);
}
static inline struct map *map_groups__first(struct map_groups *mg,
enum map_type type)
{
return maps__first(&mg->maps[type]);
}
struct map *map_groups__first(struct map_groups *mg);
static inline struct map *map_groups__next(struct map *map)
{

14
tools/perf/util/symbol.c
View File

@ -1044,6 +1044,16 @@ out_delete_from:
return ret;
}
static struct map *__map_groups__first(struct map_groups *mg, enum map_type type)
{
return maps__first(&mg->maps[type]);
}
struct map *map_groups__first(struct map_groups *mg)
{
return __map_groups__first(mg, MAP__FUNCTION);
}
static int do_validate_kcore_modules(const char *filename, struct map *map,
struct map_groups *kmaps)
{
@ -1055,7 +1065,7 @@ static int do_validate_kcore_modules(const char *filename, struct map *map,
if (err)
return err;
old_map = map_groups__first(kmaps, map->type);
old_map = __map_groups__first(kmaps, map->type);
while (old_map) {
struct map *next = map_groups__next(old_map);
struct module_info *mi;
@ -1218,7 +1228,7 @@ static int dso__load_kcore(struct dso *dso, struct map *map,
}
/* Remove old maps */
old_map = map_groups__first(kmaps, map->type);
old_map = __map_groups__first(kmaps, map->type);
while (old_map) {
struct map *next = map_groups__next(old_map);

6
tools/perf/util/vdso.c
View File

@ -139,12 +139,10 @@ static enum dso_type machine__thread_dso_type(struct machine *machine,
struct thread *thread)
{
enum dso_type dso_type = DSO__TYPE_UNKNOWN;
struct map *map;
struct dso *dso;
struct map *map = map_groups__first(thread->mg);
map = map_groups__first(thread->mg, MAP__FUNCTION);
for (; map ; map = map_groups__next(map)) {
dso = map->dso;
struct dso *dso = map->dso;
if (!dso || dso->long_name[0] != '/')
continue;
dso_type = dso__type(dso, machine);