aboutsummaryrefslogtreecommitdiffstats
path: root/tools/perf/util/symbol.c
diff options
context:
space:
mode:
authorCody P Schafer <cody@linux.vnet.ibm.com>2012-08-10 18:23:01 -0400
committerArnaldo Carvalho de Melo <acme@redhat.com>2012-08-13 13:41:33 -0400
commit261360b6e90a782f0a63d8f61a67683c376c88cf (patch)
tree81df91bf3b8f5f9133b105db5037850817284747 /tools/perf/util/symbol.c
parentd26cd12b46cb6b5595143804b43ba5aa7968551e (diff)
perf symbols: Convert dso__load_syms to take 2 symsrc's
To properly handle platforms with an opd section, both a runtime image (which contains the opd section but possibly lacks symbols) and a symbol image (which probably lacks an opd section but has symbols). The next patch ("perf symbol: use both runtime and debug images") adjusts the callsite in dso__load() to take advantage of being able to pass both runtime & debug images. Assumptions made here: - The opd section, if it exists in the runtime image, has headers in both the runtime image and the debug/syms image. - The index of the opd section (again, only if it exists in the runtime image) is the same in both the runtime and debug/symbols image. Both of these are true on RHEL, but it is unclear how accurate they are in general (on platforms with function descriptors in opd sections). Signed-off-by: Cody 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-16-git-send-email-cody@linux.vnet.ibm.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/util/symbol.c')
-rw-r--r--tools/perf/util/symbol.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c
index 8e7d74ff6ba5..739e5a32366a 100644
--- a/tools/perf/util/symbol.c
+++ b/tools/perf/util/symbol.c
@@ -1094,7 +1094,7 @@ restart:
1094 continue; 1094 continue;
1095 } 1095 }
1096 1096
1097 ret = dso__load_sym(dso, map, &ss, filter, 0); 1097 ret = dso__load_sym(dso, map, &ss, &ss, filter, 0);
1098 1098
1099 /* 1099 /*
1100 * Some people seem to have debuginfo files _WITHOUT_ debug 1100 * Some people seem to have debuginfo files _WITHOUT_ debug
@@ -1380,7 +1380,7 @@ int dso__load_vmlinux(struct dso *dso, struct map *map,
1380 if (symsrc__init(&ss, dso, symfs_vmlinux, symtab_type)) 1380 if (symsrc__init(&ss, dso, symfs_vmlinux, symtab_type))
1381 return -1; 1381 return -1;
1382 1382
1383 err = dso__load_sym(dso, map, &ss, filter, 0); 1383 err = dso__load_sym(dso, map, &ss, &ss, filter, 0);
1384 symsrc__destroy(&ss); 1384 symsrc__destroy(&ss);
1385 1385
1386 if (err > 0) { 1386 if (err > 0) {