Commit 005f9294 authored by Cody P Schafer's avatar Cody P Schafer Committed by Arnaldo Carvalho de Melo
Browse files

perf symbols: Set symtab_type in dso__load_sym 



In certain cases, dso__load requires dso->symbol_type to be set prior to
calling it. With the introduction of symsrc*, the symtab_type is now
stored in a symsrc which is then passed to dso__load_sym().

Change dso__load_sym() to use the symtab_type from them symsrc (setting
dso->symtab_type as well).

Setup for later patch

"perf symbols: Use both runtime and debug images"

Signed-off-by: default avatarCody P Schafer <cody@linux.vnet.ibm.com>
Cc: David Hansen <dave@linux.vnet.ibm.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Matt Hellsley <matthltc@us.ibm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
Link: http://lkml.kernel.org/r/1344637382-22789-13-git-send-email-cody@linux.vnet.ibm.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent b68e2f91

tools/perf/util/symbol-elf.c

+2 −0
Original line number Diff line number Diff line
@@ -645,6 +645,8 @@ int dso__load_sym(struct dso *dso, struct map *map, struct symsrc *ss, 
	int nr = 0;

	size_t opdidx = 0;



	dso->symtab_type = ss->type;



	elf = ss->elf;

	ehdr = ss->ehdr;

	sec = ss->symtab;

tools/perf/util/symbol.c

+7 −6
Original line number Diff line number Diff line
@@ -1079,14 +1079,14 @@ int dso__load(struct dso *dso, struct map *map, symbol_filter_t filter) 
restart:

	for (i = 0; i < DSO_BINARY_TYPE__SYMTAB_CNT; i++) {



		dso->symtab_type = binary_type_symtab[i];

		enum dso_binary_type symtab_type = binary_type_symtab[i];



		if (dso__binary_type_file(dso, dso->symtab_type,

		if (dso__binary_type_file(dso, symtab_type,

					  root_dir, name, PATH_MAX))

			continue;



		/* Name is now the name of the next image to try */

		if (symsrc__init(&ss, dso, name, dso->symtab_type) < 0)

		if (symsrc__init(&ss, dso, name, symtab_type) < 0)

			continue;



		ret = dso__load_sym(dso, map, &ss, filter, 0,
@@ -1361,16 +1361,17 @@ int dso__load_vmlinux(struct dso *dso, struct map *map, 
	int err = -1;

	struct symsrc ss;

	char symfs_vmlinux[PATH_MAX];

	enum dso_binary_type symtab_type;



	snprintf(symfs_vmlinux, sizeof(symfs_vmlinux), "%s%s",

		 symbol_conf.symfs, vmlinux);



	if (dso->kernel == DSO_TYPE_GUEST_KERNEL)

		dso->symtab_type = DSO_BINARY_TYPE__GUEST_VMLINUX;

		symtab_type = DSO_BINARY_TYPE__GUEST_VMLINUX;

	else

		dso->symtab_type = DSO_BINARY_TYPE__VMLINUX;

		symtab_type = DSO_BINARY_TYPE__VMLINUX;



	if (symsrc__init(&ss, dso, symfs_vmlinux, dso->symtab_type))

	if (symsrc__init(&ss, dso, symfs_vmlinux, symtab_type))

		return -1;



	err = dso__load_sym(dso, map, &ss, filter, 0, 0);

CRA Git | Maintained and supported by SUSTech CRA and CCSE