Commit 61710bde authored by Adrian Hunter's avatar Adrian Hunter Committed by Arnaldo Carvalho de Melo

perf tools: Remove filter parameter of thread__find_addr_location()

Now that the symbol filter is recorded on the machine there is no need
to pass it to thread__find_addr_location().  So remove it.
Signed-off-by: default avatarAdrian 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-8-git-send-email-adrian.hunter@intel.comSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent e44baa3e
...@@ -670,12 +670,13 @@ void thread__find_addr_map(struct thread *self, ...@@ -670,12 +670,13 @@ void thread__find_addr_map(struct thread *self,
void thread__find_addr_location(struct thread *thread, struct machine *machine, void thread__find_addr_location(struct thread *thread, struct machine *machine,
u8 cpumode, enum map_type type, u64 addr, u8 cpumode, enum map_type type, u64 addr,
struct addr_location *al, struct addr_location *al)
symbol_filter_t filter)
{ {
thread__find_addr_map(thread, machine, cpumode, type, addr, al, filter); thread__find_addr_map(thread, machine, cpumode, type, addr, al,
machine->symbol_filter);
if (al->map != NULL) if (al->map != NULL)
al->sym = map__find_symbol(al->map, al->addr, filter); al->sym = map__find_symbol(al->map, al->addr,
machine->symbol_filter);
else else
al->sym = NULL; al->sym = NULL;
} }
......
...@@ -1130,7 +1130,7 @@ static void ip__resolve_ams(struct machine *machine, struct thread *thread, ...@@ -1130,7 +1130,7 @@ static void ip__resolve_ams(struct machine *machine, struct thread *thread,
* or else, the symbol is unknown * or else, the symbol is unknown
*/ */
thread__find_addr_location(thread, machine, m, MAP__FUNCTION, thread__find_addr_location(thread, machine, m, MAP__FUNCTION,
ip, &al, NULL); ip, &al);
if (al.sym) if (al.sym)
goto found; goto found;
} }
...@@ -1148,8 +1148,8 @@ static void ip__resolve_data(struct machine *machine, struct thread *thread, ...@@ -1148,8 +1148,8 @@ static void ip__resolve_data(struct machine *machine, struct thread *thread,
memset(&al, 0, sizeof(al)); memset(&al, 0, sizeof(al));
thread__find_addr_location(thread, machine, m, MAP__VARIABLE, addr, &al, thread__find_addr_location(thread, machine, m, MAP__VARIABLE, addr,
NULL); &al);
ams->addr = addr; ams->addr = addr;
ams->al_addr = al.addr; ams->al_addr = al.addr;
ams->sym = al.sym; ams->sym = al.sym;
...@@ -1244,7 +1244,7 @@ static int machine__resolve_callchain_sample(struct machine *machine, ...@@ -1244,7 +1244,7 @@ static int machine__resolve_callchain_sample(struct machine *machine,
al.filtered = false; al.filtered = false;
thread__find_addr_location(thread, machine, cpumode, thread__find_addr_location(thread, machine, cpumode,
MAP__FUNCTION, ip, &al, NULL); MAP__FUNCTION, ip, &al);
if (al.sym != NULL) { if (al.sym != NULL) {
if (sort__has_parent && !*parent && if (sort__has_parent && !*parent &&
symbol__match_regex(al.sym, &parent_regex)) symbol__match_regex(al.sym, &parent_regex))
......
...@@ -45,8 +45,7 @@ void thread__find_addr_map(struct thread *thread, struct machine *machine, ...@@ -45,8 +45,7 @@ void thread__find_addr_map(struct thread *thread, struct machine *machine,
void thread__find_addr_location(struct thread *thread, struct machine *machine, void thread__find_addr_location(struct thread *thread, struct machine *machine,
u8 cpumode, enum map_type type, u64 addr, u8 cpumode, enum map_type type, u64 addr,
struct addr_location *al, struct addr_location *al);
symbol_filter_t filter);
static inline void *thread__priv(struct thread *thread) static inline void *thread__priv(struct thread *thread)
{ {
......
...@@ -473,7 +473,7 @@ static int entry(u64 ip, struct thread *thread, struct machine *machine, ...@@ -473,7 +473,7 @@ static int entry(u64 ip, struct thread *thread, struct machine *machine,
thread__find_addr_location(thread, machine, thread__find_addr_location(thread, machine,
PERF_RECORD_MISC_USER, PERF_RECORD_MISC_USER,
MAP__FUNCTION, ip, &al, NULL); MAP__FUNCTION, ip, &al);
e.ip = ip; e.ip = ip;
e.map = al.map; e.map = al.map;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment