diff options
author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2009-11-20 17:51:24 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-11-21 08:11:32 -0500 |
commit | 6671cb1674e69e2aba3d610714bdd3e97a7b51ff (patch) | |
tree | 61eb72c744c19086b272af4b3da21ef959ae35d5 /tools/perf/builtin-annotate.c | |
parent | 96200591a34f8ecb98481c626125df43a2463b55 (diff) |
perf symbols: Remove unrelated actions from dso__load_kernel_sym
It should just load kernel symbols, not load the list of
modules. There are more stuff to move to other routines, but
lets do it in several steps.
End goal is to be able to defer symbol table loading till we
find a hit for that map address range. So that the kernel &
modules are handled just like all the other DSOs in the system.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Frédéric Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
LKML-Reference: <1258757489-5978-1-git-send-email-acme@infradead.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'tools/perf/builtin-annotate.c')
-rw-r--r-- | tools/perf/builtin-annotate.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/perf/builtin-annotate.c b/tools/perf/builtin-annotate.c index 77d50a6d6802..b6da1476ab1b 100644 --- a/tools/perf/builtin-annotate.c +++ b/tools/perf/builtin-annotate.c | |||
@@ -33,6 +33,7 @@ static int input; | |||
33 | static int full_paths; | 33 | static int full_paths; |
34 | 34 | ||
35 | static int print_line; | 35 | static int print_line; |
36 | static bool use_modules; | ||
36 | 37 | ||
37 | static unsigned long page_size; | 38 | static unsigned long page_size; |
38 | static unsigned long mmap_window = 32; | 39 | static unsigned long mmap_window = 32; |
@@ -636,7 +637,7 @@ static int __cmd_annotate(void) | |||
636 | exit(0); | 637 | exit(0); |
637 | } | 638 | } |
638 | 639 | ||
639 | if (load_kernel(symbol_filter) < 0) { | 640 | if (load_kernel(symbol_filter, use_modules) < 0) { |
640 | perror("failed to load kernel symbols"); | 641 | perror("failed to load kernel symbols"); |
641 | return EXIT_FAILURE; | 642 | return EXIT_FAILURE; |
642 | } | 643 | } |
@@ -742,7 +743,7 @@ static const struct option options[] = { | |||
742 | OPT_BOOLEAN('D', "dump-raw-trace", &dump_trace, | 743 | OPT_BOOLEAN('D', "dump-raw-trace", &dump_trace, |
743 | "dump raw trace in ASCII"), | 744 | "dump raw trace in ASCII"), |
744 | OPT_STRING('k', "vmlinux", &vmlinux_name, "file", "vmlinux pathname"), | 745 | OPT_STRING('k', "vmlinux", &vmlinux_name, "file", "vmlinux pathname"), |
745 | OPT_BOOLEAN('m', "modules", &modules, | 746 | OPT_BOOLEAN('m', "modules", &use_modules, |
746 | "load module symbols - WARNING: use only with -k and LIVE kernel"), | 747 | "load module symbols - WARNING: use only with -k and LIVE kernel"), |
747 | OPT_BOOLEAN('l', "print-line", &print_line, | 748 | OPT_BOOLEAN('l', "print-line", &print_line, |
748 | "print matching source lines (may be slow)"), | 749 | "print matching source lines (may be slow)"), |