From c2131f4acbd7fa789d4a6e7f425493dfe726af36 Mon Sep 17 00:00:00 2001 From: Cody P Schafer Date: Fri, 10 Aug 2012 15:22:58 -0700 Subject: [PATCH] --- yaml --- r: 323683 b: refs/heads/master c: 005f92947a0da7eb47b0f1ff611f8fc3d7ab4751 h: refs/heads/master i: 323681: b1106ed332091b2a87fb8f9098657fa4998157e4 323679: b9d7ca9a79eee2ebf463710bf6817f8750230a66 v: v3 --- [refs] | 2 +- trunk/tools/perf/util/symbol-elf.c | 2 ++ trunk/tools/perf/util/symbol.c | 13 +++++++------ 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 4fef4381c977..0759b1791dea 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b68e2f919c6d3a0422239c98673c35ff503e52fb +refs/heads/master: 005f92947a0da7eb47b0f1ff611f8fc3d7ab4751 diff --git a/trunk/tools/perf/util/symbol-elf.c b/trunk/tools/perf/util/symbol-elf.c index 6974b2a44ee7..3a9c38a39bc9 100644 --- a/trunk/tools/perf/util/symbol-elf.c +++ b/trunk/tools/perf/util/symbol-elf.c @@ -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; diff --git a/trunk/tools/perf/util/symbol.c b/trunk/tools/perf/util/symbol.c index afec3f048a94..2b3495a93fb6 100644 --- a/trunk/tools/perf/util/symbol.c +++ b/trunk/tools/perf/util/symbol.c @@ -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);