diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2018-04-25 12:39:22 -0300 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2018-04-26 13:47:12 -0300 |
| commit | abe5449d2de6ccc58444451b6fed130100892097 (patch) | |
| tree | e4464b0abcdcd2654c0394ea49f3372b6ff0d462 /tools/perf/util | |
| parent | d05b861e6da27ccb0d1b882f240890b0ed40adff (diff) | |
| download | cachepc-linux-abe5449d2de6ccc58444451b6fed130100892097.tar.gz cachepc-linux-abe5449d2de6ccc58444451b6fed130100892097.zip | |
perf map: Shorten map_groups__find() signature
Removing the map_type, that is going away.
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-18iiiw25r75xn7zlppjldk48@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/util')
| -rw-r--r-- | tools/perf/util/event.c | 2 | ||||
| -rw-r--r-- | tools/perf/util/map.c | 5 | ||||
| -rw-r--r-- | tools/perf/util/map.h | 9 | ||||
| -rw-r--r-- | tools/perf/util/symbol.c | 2 |
4 files changed, 11 insertions, 7 deletions
diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c index 542bd5b79e48..a8739cd0d8ca 100644 --- a/tools/perf/util/event.c +++ b/tools/perf/util/event.c @@ -1534,7 +1534,7 @@ struct map *__thread__find_map(struct thread *thread, u8 cpumode, enum map_type return NULL; } try_again: - al->map = map_groups__find(mg, type, al->addr); + al->map = __map_groups__find(mg, type, al->addr); if (al->map == NULL) { /* * If this is outside of all known maps, and is a negative diff --git a/tools/perf/util/map.c b/tools/perf/util/map.c index f553e302bf9c..91e2afb010f8 100644 --- a/tools/perf/util/map.c +++ b/tools/perf/util/map.c @@ -574,7 +574,7 @@ struct symbol *map_groups__find_symbol(struct map_groups *mg, enum map_type type, u64 addr, struct map **mapp) { - struct map *map = map_groups__find(mg, type, addr); + struct map *map = __map_groups__find(mg, type, addr); /* Ensure map is loaded before using map->map_ip */ if (map != NULL && map__load(map) >= 0) { @@ -627,8 +627,7 @@ int map_groups__find_ams(struct addr_map_symbol *ams) if (ams->addr < ams->map->start || ams->addr >= ams->map->end) { if (ams->map->groups == NULL) return -1; - ams->map = map_groups__find(ams->map->groups, ams->map->type, - ams->addr); + ams->map = __map_groups__find(ams->map->groups, ams->map->type, ams->addr); if (ams->map == NULL) return -1; } diff --git a/tools/perf/util/map.h b/tools/perf/util/map.h index 8ff75be0a965..b4bcf569a131 100644 --- a/tools/perf/util/map.h +++ b/tools/perf/util/map.h @@ -214,12 +214,17 @@ static inline void map_groups__remove(struct map_groups *mg, struct map *map) maps__remove(&mg->maps[map->type], map); } -static inline struct map *map_groups__find(struct map_groups *mg, - enum map_type type, u64 addr) +static inline struct map *__map_groups__find(struct map_groups *mg, + enum map_type type, u64 addr) { return maps__find(&mg->maps[type], addr); } +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) { diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c index 0bf4cf76f36a..25701078beab 100644 --- a/tools/perf/util/symbol.c +++ b/tools/perf/util/symbol.c @@ -723,7 +723,7 @@ static int dso__split_kallsyms_for_kcore(struct dso *dso, struct map *map) if (module) *module = '\0'; - curr_map = map_groups__find(kmaps, map->type, pos->start); + curr_map = __map_groups__find(kmaps, map->type, pos->start); if (!curr_map) { symbol__delete(pos); |