perf symbols: Factor want_symtab out of dso__load_sym()

Only one callsite of dso__load_sym() uses the want_symtab functionality,
so place the logic at the callsite instead of within dso__load_sym().

This sets us up for removal of want_symtab completely once we keep
multiple elf handles (within symsrc's) around.

Setup for the later patch

"perf symbols: Use both runtime and debug images"

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-15-git-send-email-cody@linux.vnet.ibm.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

1 files changed, 7 insertions, 3 deletions

diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c
index f8a306865201..8e7d74ff6ba5 100644
--- a/tools/perf/util/symbol.c
+++ b/tools/perf/util/symbol.c
@@ -1089,8 +1089,12 @@ restart:
                 if (symsrc__init(&ss, dso, name, symtab_type) < 0)
                         continue;
 
-                ret = dso__load_sym(dso, map, &ss, filter, 0,
-                                    want_symtab);
+                if (want_symtab && !symsrc__has_symtab(&ss)) {
+                        symsrc__destroy(&ss);
+                        continue;
+                }
+
+                ret = dso__load_sym(dso, map, &ss, filter, 0);
 
                 /*
                  * Some people seem to have debuginfo files _WITHOUT_ debug
@@ -1376,7 +1380,7 @@ int dso__load_vmlinux(struct dso *dso, struct map *map,
         if (symsrc__init(&ss, dso, symfs_vmlinux, symtab_type))
                 return -1;
 
-        err = dso__load_sym(dso, map, &ss, filter, 0, 0);
+        err = dso__load_sym(dso, map, &ss, filter, 0);
         symsrc__destroy(&ss);
 
         if (err > 0) {