diff options
author | Adrian Hunter <adrian.hunter@intel.com> | 2013-08-08 07:32:27 -0400 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2013-08-12 09:31:12 -0400 |
commit | 326f59bf645ea6c99709c67d9712df46019fa7a8 (patch) | |
tree | 462e4956f64ce38fb123bf253c6da35c2f21dddb /tools/perf/util/event.c | |
parent | 61710bdee324aab1c148c8573ee49cea59d05874 (diff) |
perf tools: Remove filter parameter of thread__find_addr_map()
Now that the symbol filter is recorded on the machine there is no need
to pass it to thread__find_addr_map(). So remove it.
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/1375961547-30267-9-git-send-email-adrian.hunter@intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/util/event.c')
-rw-r--r-- | tools/perf/util/event.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c index 9d301c923108..49713ae46551 100644 --- a/tools/perf/util/event.c +++ b/tools/perf/util/event.c | |||
@@ -592,7 +592,7 @@ int perf_event__process(struct perf_tool *tool __maybe_unused, | |||
592 | void thread__find_addr_map(struct thread *self, | 592 | void thread__find_addr_map(struct thread *self, |
593 | struct machine *machine, u8 cpumode, | 593 | struct machine *machine, u8 cpumode, |
594 | enum map_type type, u64 addr, | 594 | enum map_type type, u64 addr, |
595 | struct addr_location *al, symbol_filter_t filter) | 595 | struct addr_location *al) |
596 | { | 596 | { |
597 | struct map_groups *mg = &self->mg; | 597 | struct map_groups *mg = &self->mg; |
598 | bool load_map = false; | 598 | bool load_map = false; |
@@ -663,7 +663,7 @@ try_again: | |||
663 | * must be done prior to using kernel maps. | 663 | * must be done prior to using kernel maps. |
664 | */ | 664 | */ |
665 | if (load_map) | 665 | if (load_map) |
666 | map__load(al->map, filter); | 666 | map__load(al->map, machine->symbol_filter); |
667 | al->addr = al->map->map_ip(al->map, al->addr); | 667 | al->addr = al->map->map_ip(al->map, al->addr); |
668 | } | 668 | } |
669 | } | 669 | } |
@@ -672,8 +672,7 @@ void thread__find_addr_location(struct thread *thread, struct machine *machine, | |||
672 | u8 cpumode, enum map_type type, u64 addr, | 672 | u8 cpumode, enum map_type type, u64 addr, |
673 | struct addr_location *al) | 673 | struct addr_location *al) |
674 | { | 674 | { |
675 | thread__find_addr_map(thread, machine, cpumode, type, addr, al, | 675 | thread__find_addr_map(thread, machine, cpumode, type, addr, al); |
676 | machine->symbol_filter); | ||
677 | if (al->map != NULL) | 676 | if (al->map != NULL) |
678 | al->sym = map__find_symbol(al->map, al->addr, | 677 | al->sym = map__find_symbol(al->map, al->addr, |
679 | machine->symbol_filter); | 678 | machine->symbol_filter); |
@@ -709,7 +708,7 @@ int perf_event__preprocess_sample(const union perf_event *event, | |||
709 | machine__create_kernel_maps(machine); | 708 | machine__create_kernel_maps(machine); |
710 | 709 | ||
711 | thread__find_addr_map(thread, machine, cpumode, MAP__FUNCTION, | 710 | thread__find_addr_map(thread, machine, cpumode, MAP__FUNCTION, |
712 | event->ip.ip, al, machine->symbol_filter); | 711 | event->ip.ip, al); |
713 | dump_printf(" ...... dso: %s\n", | 712 | dump_printf(" ...... dso: %s\n", |
714 | al->map ? al->map->dso->long_name : | 713 | al->map ? al->map->dso->long_name : |
715 | al->level == 'H' ? "[hypervisor]" : "<not found>"); | 714 | al->level == 'H' ? "[hypervisor]" : "<not found>"); |