Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 83cf774b authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

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: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent d9a5f274

tools/perf/tests/vmlinux-kallsyms.c

+1 −1
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ int test__vmlinux_matches_kallsyms(struct test *test __maybe_unused, int subtest 
		 * 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));

tools/perf/util/machine.c

+2 −4
Original line number Diff line number Diff line
@@ -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;

tools/perf/util/map.h

+6 −2
Original line number Diff line number Diff line
@@ -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);

tools/perf/util/probe-event.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

tools/perf/util/symbol-elf.c

+1 −1
Original line number Diff line number Diff line
@@ -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;