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

Commit 480ca357 authored by Andi Kleen's avatar Andi Kleen Committed by Arnaldo Carvalho de Melo
Browse files

perf thread: Adopt get_main_thread from db-export.c 



Move the get_main_thread function from db-export.c to thread.c so that
it can be used elsewhere.

Signed-off-by: default avatarAndi Kleen <ak@linux.intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Link: http://lkml.kernel.org/r/1464051145-19968-2-git-send-email-andi@firstfloor.org


[ Removed leftover bits from db-export.h ]
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 71146051

tools/perf/util/db-export.c

+1 −12
Original line number Original line Diff line number Diff line
@@ -233,17 +233,6 @@ int db_export__symbol(struct db_export *dbe, struct symbol *sym, 
	return 0;

	return 0;

}

}





static struct thread *get_main_thread(struct machine *machine, struct thread *thread)

{

	if (thread->pid_ == thread->tid)

		return thread__get(thread);



	if (thread->pid_ == -1)

		return NULL;



	return machine__find_thread(machine, thread->pid_, thread->pid_);

}



static int db_ids_from_al(struct db_export *dbe, struct addr_location *al,

static int db_ids_from_al(struct db_export *dbe, struct addr_location *al,

			  u64 *dso_db_id, u64 *sym_db_id, u64 *offset)

			  u64 *dso_db_id, u64 *sym_db_id, u64 *offset)

{

{
@@ -382,7 +371,7 @@ int db_export__sample(struct db_export *dbe, union perf_event *event, 
	if (err)

	if (err)

		return err;

		return err;





	main_thread = get_main_thread(al->machine, thread);

	main_thread = thread__main_thread(al->machine, thread);

	if (main_thread)

	if (main_thread)

		comm = machine__thread_exec_comm(al->machine, main_thread);

		comm = machine__thread_exec_comm(al->machine, main_thread);

tools/perf/util/thread.c

+11 −0
Original line number Original line Diff line number Diff line
@@ -265,3 +265,14 @@ void thread__find_cpumode_addr_location(struct thread *thread, 
			break;

			break;

	}

	}

}

}



struct thread *thread__main_thread(struct machine *machine, struct thread *thread)

{

	if (thread->pid_ == thread->tid)

		return thread__get(thread);



	if (thread->pid_ == -1)

		return NULL;



	return machine__find_thread(machine, thread->pid_, thread->pid_);

}

tools/perf/util/thread.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -81,6 +81,8 @@ void thread__insert_map(struct thread *thread, struct map *map); 
int thread__fork(struct thread *thread, struct thread *parent, u64 timestamp);

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

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

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





struct thread *thread__main_thread(struct machine *machine, struct thread *thread);



void thread__find_addr_map(struct thread *thread,

void thread__find_addr_map(struct thread *thread,

			   u8 cpumode, enum map_type type, u64 addr,

			   u8 cpumode, enum map_type type, u64 addr,

			   struct addr_location *al);

			   struct addr_location *al);