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>
This commit is contained in:
Родитель
61710bdee3
Коммит
326f59bf64
|
@ -206,7 +206,7 @@ static int perf_event__inject_buildid(struct perf_tool *tool,
|
|||
}
|
||||
|
||||
thread__find_addr_map(thread, machine, cpumode, MAP__FUNCTION,
|
||||
event->ip.ip, &al, NULL);
|
||||
event->ip.ip, &al);
|
||||
|
||||
if (al.map != NULL) {
|
||||
if (!al.map->dso->hit) {
|
||||
|
|
|
@ -361,10 +361,10 @@ static void print_sample_addr(union perf_event *event,
|
|||
return;
|
||||
|
||||
thread__find_addr_map(thread, machine, cpumode, MAP__FUNCTION,
|
||||
sample->addr, &al, NULL);
|
||||
sample->addr, &al);
|
||||
if (!al.map)
|
||||
thread__find_addr_map(thread, machine, cpumode, MAP__VARIABLE,
|
||||
sample->addr, &al, NULL);
|
||||
sample->addr, &al);
|
||||
|
||||
al.cpu = sample->cpu;
|
||||
al.sym = NULL;
|
||||
|
|
|
@ -147,7 +147,7 @@ static int read_object_code(u64 addr, size_t len, u8 cpumode,
|
|||
pr_debug("Reading object code for memory address: %#"PRIx64"\n", addr);
|
||||
|
||||
thread__find_addr_map(thread, machine, cpumode, MAP__FUNCTION, addr,
|
||||
&al, NULL);
|
||||
&al);
|
||||
if (!al.map || !al.map->dso) {
|
||||
pr_debug("thread__find_addr_map failed\n");
|
||||
return -1;
|
||||
|
|
|
@ -33,7 +33,7 @@ int build_id__mark_dso_hit(struct perf_tool *tool __maybe_unused,
|
|||
}
|
||||
|
||||
thread__find_addr_map(thread, machine, cpumode, MAP__FUNCTION,
|
||||
event->ip.ip, &al, NULL);
|
||||
event->ip.ip, &al);
|
||||
|
||||
if (al.map != NULL)
|
||||
al.map->dso->hit = 1;
|
||||
|
|
|
@ -592,7 +592,7 @@ int perf_event__process(struct perf_tool *tool __maybe_unused,
|
|||
void thread__find_addr_map(struct thread *self,
|
||||
struct machine *machine, u8 cpumode,
|
||||
enum map_type type, u64 addr,
|
||||
struct addr_location *al, symbol_filter_t filter)
|
||||
struct addr_location *al)
|
||||
{
|
||||
struct map_groups *mg = &self->mg;
|
||||
bool load_map = false;
|
||||
|
@ -663,7 +663,7 @@ try_again:
|
|||
* must be done prior to using kernel maps.
|
||||
*/
|
||||
if (load_map)
|
||||
map__load(al->map, filter);
|
||||
map__load(al->map, machine->symbol_filter);
|
||||
al->addr = al->map->map_ip(al->map, al->addr);
|
||||
}
|
||||
}
|
||||
|
@ -672,8 +672,7 @@ void thread__find_addr_location(struct thread *thread, struct machine *machine,
|
|||
u8 cpumode, enum map_type type, u64 addr,
|
||||
struct addr_location *al)
|
||||
{
|
||||
thread__find_addr_map(thread, machine, cpumode, type, addr, al,
|
||||
machine->symbol_filter);
|
||||
thread__find_addr_map(thread, machine, cpumode, type, addr, al);
|
||||
if (al->map != NULL)
|
||||
al->sym = map__find_symbol(al->map, al->addr,
|
||||
machine->symbol_filter);
|
||||
|
@ -709,7 +708,7 @@ int perf_event__preprocess_sample(const union perf_event *event,
|
|||
machine__create_kernel_maps(machine);
|
||||
|
||||
thread__find_addr_map(thread, machine, cpumode, MAP__FUNCTION,
|
||||
event->ip.ip, al, machine->symbol_filter);
|
||||
event->ip.ip, al);
|
||||
dump_printf(" ...... dso: %s\n",
|
||||
al->map ? al->map->dso->long_name :
|
||||
al->level == 'H' ? "[hypervisor]" : "<not found>");
|
||||
|
|
|
@ -41,7 +41,7 @@ static inline struct map *thread__find_map(struct thread *self,
|
|||
|
||||
void thread__find_addr_map(struct thread *thread, struct machine *machine,
|
||||
u8 cpumode, enum map_type type, u64 addr,
|
||||
struct addr_location *al, symbol_filter_t filter);
|
||||
struct addr_location *al);
|
||||
|
||||
void thread__find_addr_location(struct thread *thread, struct machine *machine,
|
||||
u8 cpumode, enum map_type type, u64 addr,
|
||||
|
|
|
@ -272,7 +272,7 @@ static struct map *find_map(unw_word_t ip, struct unwind_info *ui)
|
|||
struct addr_location al;
|
||||
|
||||
thread__find_addr_map(ui->thread, ui->machine, PERF_RECORD_MISC_USER,
|
||||
MAP__FUNCTION, ip, &al, NULL);
|
||||
MAP__FUNCTION, ip, &al);
|
||||
return al.map;
|
||||
}
|
||||
|
||||
|
@ -349,7 +349,7 @@ static int access_dso_mem(struct unwind_info *ui, unw_word_t addr,
|
|||
ssize_t size;
|
||||
|
||||
thread__find_addr_map(ui->thread, ui->machine, PERF_RECORD_MISC_USER,
|
||||
MAP__FUNCTION, addr, &al, NULL);
|
||||
MAP__FUNCTION, addr, &al);
|
||||
if (!al.map) {
|
||||
pr_debug("unwind: no map for %lx\n", (unsigned long)addr);
|
||||
return -1;
|
||||
|
|
Загрузка…
Ссылка в новой задаче