Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent e44baa3e

tools/perf/util/event.c

+5 −4
Original line number Diff line number Diff line
@@ -670,12 +670,13 @@ void thread__find_addr_map(struct thread *self, 


void thread__find_addr_location(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)

{

	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)

		al->sym = map__find_symbol(al->map, al->addr, filter);

		al->sym = map__find_symbol(al->map, al->addr,

					   machine->symbol_filter);

	else

		al->sym = NULL;

}

tools/perf/util/machine.c

+4 −4
Original line number Diff line number Diff line
@@ -1130,7 +1130,7 @@ static void ip__resolve_ams(struct machine *machine, struct thread *thread, 
		 * or else, the symbol is unknown

		 */

		thread__find_addr_location(thread, machine, m, MAP__FUNCTION,

				ip, &al, NULL);

				ip, &al);

		if (al.sym)

			goto found;

	}
@@ -1148,8 +1148,8 @@ static void ip__resolve_data(struct machine *machine, struct thread *thread, 


	memset(&al, 0, sizeof(al));



	thread__find_addr_location(thread, machine, m, MAP__VARIABLE, addr, &al,

				   NULL);

	thread__find_addr_location(thread, machine, m, MAP__VARIABLE, addr,

				   &al);

	ams->addr = addr;

	ams->al_addr = al.addr;

	ams->sym = al.sym;
@@ -1244,7 +1244,7 @@ static int machine__resolve_callchain_sample(struct machine *machine, 


		al.filtered = false;

		thread__find_addr_location(thread, machine, cpumode,

					   MAP__FUNCTION, ip, &al, NULL);

					   MAP__FUNCTION, ip, &al);

		if (al.sym != NULL) {

			if (sort__has_parent && !*parent &&

			    symbol__match_regex(al.sym, &parent_regex))

tools/perf/util/thread.h

+1 −2
Original line number Diff line number Diff line
@@ -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,

				u8 cpumode, enum map_type type, u64 addr,

				struct addr_location *al,

				symbol_filter_t filter);

				struct addr_location *al);



static inline void *thread__priv(struct thread *thread)

{

tools/perf/util/unwind.c

+1 −1
Original line number Diff line number Diff line
@@ -473,7 +473,7 @@ static int entry(u64 ip, struct thread *thread, struct machine *machine, 


	thread__find_addr_location(thread, machine,

				   PERF_RECORD_MISC_USER,

				   MAP__FUNCTION, ip, &al, NULL);

				   MAP__FUNCTION, ip, &al);



	e.ip = ip;

	e.map = al.map;