Commit 117d3c24 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

perf thread: Ditch __thread__find_symbol() 

Simulate having all symbols in just one tree by searching the still
existing two trees.

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-uss70e8tvzzbzs326330t83q@git.kernel.org


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

tools/perf/builtin-trace.c

+1 −1
Original line number Diff line number Diff line
@@ -2036,7 +2036,7 @@ static int trace__pgfault(struct trace *trace, 


	fprintf(trace->output, "] => ");



	__thread__find_symbol(thread, sample->cpumode, MAP__VARIABLE, sample->addr, &al);

	thread__find_symbol(thread, sample->cpumode, sample->addr, &al);



	if (!al.map) {

		thread__find_symbol(thread, sample->cpumode, sample->addr, &al);

tools/perf/util/event.c

+4 −4
Original line number Diff line number Diff line
@@ -1565,12 +1565,12 @@ try_again: 
	return al->map;

}



struct symbol *__thread__find_symbol(struct thread *thread, u8 cpumode,

				     enum map_type type, u64 addr,

				     struct addr_location *al)

struct symbol *thread__find_symbol(struct thread *thread, u8 cpumode,

				   u64 addr, struct addr_location *al)

{

	al->sym = NULL;

	if (__thread__find_map(thread, cpumode, type, addr, al))

	if (__thread__find_map(thread, cpumode, MAP__FUNCTION, addr, al) ||

	    __thread__find_map(thread, cpumode, MAP__VARIABLE, addr, al))

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

	return al->sym;

}

tools/perf/util/machine.c

+1 −9
Original line number Diff line number Diff line
@@ -1677,15 +1677,7 @@ static void ip__resolve_data(struct thread *thread, 


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



	__thread__find_symbol(thread, m, MAP__VARIABLE, addr, &al);

	if (al.map == NULL) {

		/*

		 * some shared data regions have execute bit set which puts

		 * their mapping in the MAP__FUNCTION type array.

		 * Check there as a fallback option before dropping the sample.

		 */

	thread__find_symbol(thread, m, addr, &al);

	}



	ams->addr = addr;

	ams->al_addr = al.addr;

tools/perf/util/thread.h

+2 −8
Original line number Diff line number Diff line
@@ -101,15 +101,9 @@ static inline struct map *thread__find_map(struct thread *thread, u8 cpumode, 
	return __thread__find_map(thread, cpumode, MAP__FUNCTION, addr, al);

}



struct symbol *__thread__find_symbol(struct thread *thread, u8 cpumode, enum map_type type,

struct symbol *thread__find_symbol(struct thread *thread, u8 cpumode,

				   u64 addr, struct addr_location *al);



static inline struct symbol *thread__find_symbol(struct thread *thread, u8 cpumode,

						 u64 addr, struct addr_location *al)

{

	return __thread__find_symbol(thread, cpumode, MAP__FUNCTION, addr, al);

}



void thread__find_cpumode_addr_location(struct thread *thread, u64 addr,

					struct addr_location *al);

CRA Git | Maintained and supported by SUSTech CRA and CCSE