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

Commit 8132a2a8 authored by He Kuang's avatar He Kuang Committed by Arnaldo Carvalho de Melo
Browse files

perf unwind: Move unwind__prepare_access from thread_new into thread__insert_map 



To determine the libunwind methods to use, we should get the
32bit/64bit information from maps of a thread. When a thread is newly
created, the information is not prepared. This patch moves
unwind__prepare_access() into thread__insert_map() so we can get the
information we need from maps. Meanwhile, let thread__insert_map()
return value and show messages on error.

Signed-off-by: default avatarHe Kuang <hekuang@huawei.com>
Acked-by: default avatarJiri Olsa <jolsa@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Ekaterina Tumanova <tumanova@linux.vnet.ibm.com>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Kan Liang <kan.liang@intel.com>
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Pekka Enberg <penberg@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/r/1464924803-22214-5-git-send-email-hekuang@huawei.com


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

tools/perf/util/machine.c

+12 −2
Original line number Diff line number Diff line
@@ -1353,11 +1353,16 @@ int machine__process_mmap2_event(struct machine *machine, 
	if (map == NULL)

		goto out_problem_map;



	thread__insert_map(thread, map);

	ret = thread__insert_map(thread, map);

	if (ret)

		goto out_problem_insert;



	thread__put(thread);

	map__put(map);

	return 0;



out_problem_insert:

	map__put(map);

out_problem_map:

	thread__put(thread);

out_problem:
@@ -1403,11 +1408,16 @@ int machine__process_mmap_event(struct machine *machine, union perf_event *event 
	if (map == NULL)

		goto out_problem_map;



	thread__insert_map(thread, map);

	ret = thread__insert_map(thread, map);

	if (ret)

		goto out_problem_insert;



	thread__put(thread);

	map__put(map);

	return 0;



out_problem_insert:

	map__put(map);

out_problem_map:

	thread__put(thread);

out_problem:

tools/perf/util/thread.c

+9 −4
Original line number Diff line number Diff line
@@ -43,9 +43,6 @@ struct thread *thread__new(pid_t pid, pid_t tid) 
		thread->cpu = -1;

		INIT_LIST_HEAD(&thread->comm_list);



		if (unwind__prepare_access(thread) < 0)

			goto err_thread;



		comm_str = malloc(32);

		if (!comm_str)

			goto err_thread;
@@ -201,10 +198,18 @@ size_t thread__fprintf(struct thread *thread, FILE *fp) 
	       map_groups__fprintf(thread->mg, fp);

}



void thread__insert_map(struct thread *thread, struct map *map)

int thread__insert_map(struct thread *thread, struct map *map)

{

	int ret;



	ret = unwind__prepare_access(thread);

	if (ret)

		return ret;



	map_groups__fixup_overlappings(thread->mg, map, stderr);

	map_groups__insert(thread->mg, map);



	return 0;

}



static int thread__clone_map_groups(struct thread *thread,

tools/perf/util/thread.h

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ int thread__comm_len(struct thread *thread); 
struct comm *thread__comm(const struct thread *thread);

struct comm *thread__exec_comm(const struct thread *thread);

const char *thread__comm_str(const struct thread *thread);

void thread__insert_map(struct thread *thread, struct map *map);

int thread__insert_map(struct thread *thread, struct map *map);

int thread__fork(struct thread *thread, struct thread *parent, u64 timestamp);

size_t thread__fprintf(struct thread *thread, FILE *fp);