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

Commit 26bd9331 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

perf thread: Remove addr_type arg from thread__find_cpumode_addr_location() 

All callers are for MAP__FUNCTION, so just ditch it and use
thread__find_symbol(), that already ditched MAP__FUNCTION, i.e.
internally uses it till we ditch it for good.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: https://lkml.kernel.org/n/tip-i0ocxs00b4a0tlrx31lyh2cs@git.kernel.org


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

tools/perf/util/machine.c

+2 −3
Original line number Diff line number Diff line
@@ -1660,7 +1660,7 @@ static void ip__resolve_ams(struct thread *thread, 
	 * Thus, we have to try consecutively until we find a match

	 * or else, the symbol is unknown

	 */

	thread__find_cpumode_addr_location(thread, MAP__FUNCTION, ip, &al);

	thread__find_cpumode_addr_location(thread, ip, &al);



	ams->addr = ip;

	ams->al_addr = al.addr;
@@ -1754,8 +1754,7 @@ static int add_callchain_ip(struct thread *thread, 
	al.filtered = 0;

	al.sym = NULL;

	if (!cpumode) {

		thread__find_cpumode_addr_location(thread, MAP__FUNCTION,

						   ip, &al);

		thread__find_cpumode_addr_location(thread, ip, &al);

	} else {

		if (ip >= PERF_CONTEXT_MAX) {

			switch (ip) {

tools/perf/util/thread.c

+2 −3
Original line number Diff line number Diff line
@@ -371,8 +371,7 @@ int thread__fork(struct thread *thread, struct thread *parent, u64 timestamp) 
	return thread__clone_map_groups(thread, parent);

}



void thread__find_cpumode_addr_location(struct thread *thread,

					enum map_type type, u64 addr,

void thread__find_cpumode_addr_location(struct thread *thread, u64 addr,

					struct addr_location *al)

{

	size_t i;
@@ -384,7 +383,7 @@ void thread__find_cpumode_addr_location(struct thread *thread, 
	};



	for (i = 0; i < ARRAY_SIZE(cpumodes); i++) {

		__thread__find_symbol(thread, cpumodes[i], type, addr, al);

		thread__find_symbol(thread, cpumodes[i], addr, al);

		if (al->map)

			break;

	}

tools/perf/util/thread.h

+1 −2
Original line number Diff line number Diff line
@@ -110,8 +110,7 @@ static inline struct symbol *thread__find_symbol(struct thread *thread, u8 cpumo 
	return __thread__find_symbol(thread, cpumode, MAP__FUNCTION, addr, al);

}



void thread__find_cpumode_addr_location(struct thread *thread,

					enum map_type type, u64 addr,

void thread__find_cpumode_addr_location(struct thread *thread, u64 addr,

					struct addr_location *al);



static inline void *thread__priv(struct thread *thread)