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

Commit d75e6097 authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo
Browse files

perf machine: Factor machine__find_thread to take tid argument 



Forcing the code to always search thread by pid/tid pair.

The PID value will be needed in future to determine the process thread
leader for map groups sharing.

Signed-off-by: default avatarJiri Olsa <jolsa@redhat.com>
Acked-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Don Zickus <dzickus@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1394805606-25883-3-git-send-email-jolsa@redhat.com


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

tools/perf/tests/dwarf-unwind.c

+1 −1
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ int test__dwarf_unwind(void) 
	if (verbose > 1)

		machine__fprintf(machine, stderr);



	thread = machine__find_thread(machine, getpid());

	thread = machine__find_thread(machine, getpid(), getpid());

	if (!thread) {

		pr_err("Could not get thread\n");

		goto out;

tools/perf/util/machine.c

+9 −4
Original line number Diff line number Diff line
@@ -327,9 +327,10 @@ struct thread *machine__findnew_thread(struct machine *machine, pid_t pid, 
	return __machine__findnew_thread(machine, pid, tid, true);

}



struct thread *machine__find_thread(struct machine *machine, pid_t tid)

struct thread *machine__find_thread(struct machine *machine, pid_t pid,

				    pid_t tid)

{

	return __machine__findnew_thread(machine, 0, tid, false);

	return __machine__findnew_thread(machine, pid, tid, false);

}



int machine__process_comm_event(struct machine *machine, union perf_event *event,
@@ -1114,7 +1115,9 @@ static void machine__remove_thread(struct machine *machine, struct thread *th) 
int machine__process_fork_event(struct machine *machine, union perf_event *event,

				struct perf_sample *sample)

{

	struct thread *thread = machine__find_thread(machine, event->fork.tid);

	struct thread *thread = machine__find_thread(machine,

						     event->fork.pid,

						     event->fork.tid);

	struct thread *parent = machine__findnew_thread(machine,

							event->fork.ppid,

							event->fork.ptid);
@@ -1140,7 +1143,9 @@ int machine__process_fork_event(struct machine *machine, union perf_event *event 
int machine__process_exit_event(struct machine *machine, union perf_event *event,

				struct perf_sample *sample __maybe_unused)

{

	struct thread *thread = machine__find_thread(machine, event->fork.tid);

	struct thread *thread = machine__find_thread(machine,

						     event->fork.pid,

						     event->fork.tid);



	if (dump_trace)

		perf_event__fprintf_task(event, stdout);

tools/perf/util/machine.h

+2 −1
Original line number Diff line number Diff line
@@ -41,7 +41,8 @@ struct map *machine__kernel_map(struct machine *machine, enum map_type type) 
	return machine->vmlinux_maps[type];

}



struct thread *machine__find_thread(struct machine *machine, pid_t tid);

struct thread *machine__find_thread(struct machine *machine, pid_t pid,

				    pid_t tid);



int machine__process_comm_event(struct machine *machine, union perf_event *event,

				struct perf_sample *sample);