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

Commit 4546263d authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

perf thread: Introduce thread__find_symbol() 

Out of thread__find_addr_location(..., MAP__FUNCTION, ...), idea here is to
continue removing references to MAP__{FUNCTION,VARIABLE} ahead of
getting both types of symbols in the same rbtree, as various places do
two lookups, looking first at MAP__FUNCTION, then at MAP__VARIABLE.

So thread__find_symbol() will eventually do just that, and 'struct
symbol' will have the symbol type, for code that cares about that.

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


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

tools/perf/arch/powerpc/util/skip-callchain-idx.c

+1 −2
Original line number Diff line number Diff line
@@ -248,8 +248,7 @@ int arch_skip_callchain_idx(struct thread *thread, struct ip_callchain *chain) 


	ip = chain->ips[2];



	thread__find_addr_location(thread, PERF_RECORD_MISC_USER,

			MAP__FUNCTION, ip, &al);

	thread__find_symbol(thread, PERF_RECORD_MISC_USER, ip, &al);



	if (al.map)

		dso = al.map->dso;

tools/perf/builtin-timechart.c

+1 −2
Original line number Diff line number Diff line
@@ -533,8 +533,7 @@ static const char *cat_backtrace(union perf_event *event, 
		}



		tal.filtered = 0;

		thread__find_addr_location(al.thread, cpumode,

					   MAP__FUNCTION, ip, &tal);

		thread__find_symbol(al.thread, cpumode, ip, &tal);



		if (tal.sym)

			fprintf(f, "..... %016" PRIx64 " %s\n", ip,

tools/perf/builtin-trace.c

+3 −6
Original line number Diff line number Diff line
@@ -2024,8 +2024,7 @@ static int trace__pgfault(struct trace *trace, 
	if (trace->summary_only)

		goto out;



	thread__find_addr_location(thread, sample->cpumode, MAP__FUNCTION,

			      sample->ip, &al);

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



	trace__fprintf_entry_head(trace, thread, 0, true, sample->time, trace->output);
@@ -2037,12 +2036,10 @@ static int trace__pgfault(struct trace *trace, 


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



	thread__find_addr_location(thread, sample->cpumode, MAP__VARIABLE,

				   sample->addr, &al);

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



	if (!al.map) {

		thread__find_addr_location(thread, sample->cpumode,

					   MAP__FUNCTION, sample->addr, &al);

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



		if (al.map)

			map_type = 'x';

tools/perf/util/event.c

+3 −3
Original line number Diff line number Diff line
@@ -1564,8 +1564,8 @@ void __thread__find_map(struct thread *thread, u8 cpumode, enum map_type type, 
	}

}



void thread__find_addr_location(struct thread *thread,

				u8 cpumode, enum map_type type, u64 addr,

void __thread__find_symbol(struct thread *thread, u8 cpumode,

			   enum map_type type, u64 addr,

			   struct addr_location *al)

{

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

tools/perf/util/machine.c

+3 −4
Original line number Diff line number Diff line
@@ -1681,14 +1681,14 @@ static void ip__resolve_data(struct thread *thread, 


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



	thread__find_addr_location(thread, m, MAP__VARIABLE, addr, &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_addr_location(thread, m, MAP__FUNCTION, addr, &al);

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

	}



	ams->addr = addr;
@@ -1784,8 +1784,7 @@ static int add_callchain_ip(struct thread *thread, 
			}

			return 0;

		}

		thread__find_addr_location(thread, *cpumode, MAP__FUNCTION,

					   ip, &al);

		thread__find_symbol(thread, *cpumode, ip, &al);

	}



	if (al.sym != NULL) {