mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-21 11:44:01 +08:00
perf map: Shorten map_groups__find_by_name() signature
Another step in the road to elliminate the MAP_{FUNCTION,VARIABLE} separation, reducing the exposure to these details in the tools using the symbol APIs. 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-8a1hvrqe3r5i0kw865u3uxwt@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
parent
d9a5f27460
commit
83cf774b02
@ -183,7 +183,7 @@ next_pair:
|
||||
* so use the short name, less descriptive but the same ("[kernel]" in
|
||||
* both cases.
|
||||
*/
|
||||
pair = map_groups__find_by_name(&kallsyms.kmaps, type,
|
||||
pair = map_groups__find_by_name(&kallsyms.kmaps,
|
||||
(map->dso->kernel ?
|
||||
map->dso->short_name :
|
||||
map->dso->name));
|
||||
|
@ -673,8 +673,7 @@ struct map *machine__findnew_module_map(struct machine *machine, u64 start,
|
||||
if (kmod_path__parse_name(&m, filename))
|
||||
return NULL;
|
||||
|
||||
map = map_groups__find_by_name(&machine->kmaps, MAP__FUNCTION,
|
||||
m.name);
|
||||
map = map_groups__find_by_name(&machine->kmaps, m.name);
|
||||
if (map) {
|
||||
/*
|
||||
* If the map's dso is an offline module, give dso__load()
|
||||
@ -1055,10 +1054,9 @@ static bool is_kmod_dso(struct dso *dso)
|
||||
static int map_groups__set_module_path(struct map_groups *mg, const char *path,
|
||||
struct kmod_path *m)
|
||||
{
|
||||
struct map *map;
|
||||
char *long_name;
|
||||
struct map *map = map_groups__find_by_name(mg, m->name);
|
||||
|
||||
map = map_groups__find_by_name(mg, MAP__FUNCTION, m->name);
|
||||
if (map == NULL)
|
||||
return 0;
|
||||
|
||||
|
@ -254,8 +254,12 @@ struct symbol *map_groups__find_function_by_name(struct map_groups *mg,
|
||||
int map_groups__fixup_overlappings(struct map_groups *mg, struct map *map,
|
||||
FILE *fp);
|
||||
|
||||
struct map *map_groups__find_by_name(struct map_groups *mg,
|
||||
enum map_type type, const char *name);
|
||||
struct map *__map_groups__find_by_name(struct map_groups *mg, enum map_type type, const char *name);
|
||||
|
||||
static inline struct map *map_groups__find_by_name(struct map_groups *mg, const char *name)
|
||||
{
|
||||
return __map_groups__find_by_name(mg, MAP__FUNCTION, name);
|
||||
}
|
||||
|
||||
bool __map__is_kernel(const struct map *map);
|
||||
|
||||
|
@ -341,7 +341,7 @@ static int kernel_get_module_dso(const char *module, struct dso **pdso)
|
||||
char module_name[128];
|
||||
|
||||
snprintf(module_name, sizeof(module_name), "[%s]", module);
|
||||
map = map_groups__find_by_name(&host_machine->kmaps, MAP__FUNCTION, module_name);
|
||||
map = map_groups__find_by_name(&host_machine->kmaps, module_name);
|
||||
if (map) {
|
||||
dso = map->dso;
|
||||
goto found;
|
||||
|
@ -1042,7 +1042,7 @@ int dso__load_sym(struct dso *dso, struct map *map, struct symsrc *syms_ss,
|
||||
snprintf(dso_name, sizeof(dso_name),
|
||||
"%s%s", dso->short_name, section_name);
|
||||
|
||||
curr_map = map_groups__find_by_name(kmaps, map->type, dso_name);
|
||||
curr_map = __map_groups__find_by_name(kmaps, map->type, dso_name);
|
||||
if (curr_map == NULL) {
|
||||
u64 start = sym.st_value;
|
||||
|
||||
|
@ -792,8 +792,7 @@ static int dso__split_kallsyms(struct dso *dso, struct map *map, u64 delta)
|
||||
curr_map->type);
|
||||
}
|
||||
|
||||
curr_map = map_groups__find_by_name(kmaps,
|
||||
map->type, module);
|
||||
curr_map = __map_groups__find_by_name(kmaps, map->type, module);
|
||||
if (curr_map == NULL) {
|
||||
pr_debug("%s/proc/{kallsyms,modules} "
|
||||
"inconsistency while looking "
|
||||
@ -1667,8 +1666,7 @@ out:
|
||||
return ret;
|
||||
}
|
||||
|
||||
struct map *map_groups__find_by_name(struct map_groups *mg,
|
||||
enum map_type type, const char *name)
|
||||
struct map *__map_groups__find_by_name(struct map_groups *mg, enum map_type type, const char *name)
|
||||
{
|
||||
struct maps *maps = &mg->maps[type];
|
||||
struct map *map;
|
||||
|
Loading…
Reference in New Issue
Block a user