Skip to content

Commit

Permalink
perf thread: Adopt get_main_thread from db-export.c
Browse files Browse the repository at this point in the history
Move the get_main_thread function from db-export.c to thread.c so that
it can be used elsewhere.

Signed-off-by: Andi 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: Arnaldo Carvalho de Melo <acme@redhat.com>
  • Loading branch information
Andi Kleen authored and Arnaldo Carvalho de Melo committed May 30, 2016
1 parent 7114605 commit 480ca35
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 12 deletions.
13 changes: 1 addition & 12 deletions tools/perf/util/db-export.c
Original file line number Diff line number Diff line change
Expand Up @@ -233,17 +233,6 @@ int db_export__symbol(struct db_export *dbe, struct symbol *sym,
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,
u64 *dso_db_id, u64 *sym_db_id, u64 *offset)
{
Expand Down Expand Up @@ -382,7 +371,7 @@ int db_export__sample(struct db_export *dbe, union perf_event *event,
if (err)
return err;

main_thread = get_main_thread(al->machine, thread);
main_thread = thread__main_thread(al->machine, thread);
if (main_thread)
comm = machine__thread_exec_comm(al->machine, main_thread);

Expand Down
11 changes: 11 additions & 0 deletions tools/perf/util/thread.c
Original file line number Diff line number Diff line change
Expand Up @@ -265,3 +265,14 @@ void thread__find_cpumode_addr_location(struct thread *thread,
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_);
}
2 changes: 2 additions & 0 deletions tools/perf/util/thread.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
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,
u8 cpumode, enum map_type type, u64 addr,
struct addr_location *al);
Expand Down

0 comments on commit 480ca35

Please sign in to comment.