Commit 314add6b authored by Adrian Hunter's avatar Adrian Hunter Committed by Arnaldo Carvalho de Melo
Browse files

perf tools: change machine__findnew_thread() to set thread pid 



Add a new parameter for 'pid' to machine__findnew_thread().
Change callers to pass 'pid' when it is known.

Note that callers sometimes want to find the main thread
which has the memory maps.  The main thread has tid == pid
so the usage in that case is:

	machine__findnew_thread(machine, pid, pid)

whereas the usage to find the specific thread is:

	machine__findnew_thread(machine, pid, tid)

Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Acked-by: default avatarDavid Ahern <dsahern@gmail.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/1377591794-30553-2-git-send-email-adrian.hunter@intel.com


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

tools/perf/builtin-inject.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -198,7 +198,7 @@ static int perf_event__inject_buildid(struct perf_tool *tool, 




	cpumode = event->header.misc & PERF_RECORD_MISC_CPUMODE_MASK;

	cpumode = event->header.misc & PERF_RECORD_MISC_CPUMODE_MASK;





	thread = machine__findnew_thread(machine, event->ip.pid);

	thread = machine__findnew_thread(machine, event->ip.pid, event->ip.pid);

	if (thread == NULL) {

	if (thread == NULL) {

		pr_err("problem processing %d event, skipping it.\n",

		pr_err("problem processing %d event, skipping it.\n",

		       event->header.type);

		       event->header.type);

tools/perf/builtin-kmem.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -305,7 +305,8 @@ static int process_sample_event(struct perf_tool *tool __maybe_unused, 
				struct perf_evsel *evsel,

				struct perf_evsel *evsel,

				struct machine *machine)

				struct machine *machine)

{

{

	struct thread *thread = machine__findnew_thread(machine, event->ip.pid);

	struct thread *thread = machine__findnew_thread(machine, event->ip.pid,

							event->ip.pid);





	if (thread == NULL) {

	if (thread == NULL) {

		pr_debug("problem processing %d event, skipping it.\n",

		pr_debug("problem processing %d event, skipping it.\n",

tools/perf/builtin-kvm.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -815,7 +815,7 @@ static int process_sample_event(struct perf_tool *tool, 
	if (skip_sample(kvm, sample))

	if (skip_sample(kvm, sample))

		return 0;

		return 0;





	thread = machine__findnew_thread(machine, sample->tid);

	thread = machine__findnew_thread(machine, sample->pid, sample->tid);

	if (thread == NULL) {

	if (thread == NULL) {

		pr_debug("problem processing %d event, skipping it.\n",

		pr_debug("problem processing %d event, skipping it.\n",

			event->header.type);

			event->header.type);

tools/perf/builtin-lock.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -805,7 +805,8 @@ static int process_sample_event(struct perf_tool *tool __maybe_unused, 
				struct perf_evsel *evsel,

				struct perf_evsel *evsel,

				struct machine *machine)

				struct machine *machine)

{

{

	struct thread *thread = machine__findnew_thread(machine, sample->tid);

	struct thread *thread = machine__findnew_thread(machine, sample->pid,

							sample->tid);





	if (thread == NULL) {

	if (thread == NULL) {

		pr_debug("problem processing %d event, skipping it.\n",

		pr_debug("problem processing %d event, skipping it.\n",

tools/perf/builtin-sched.c

+11 −9
Original line number Original line Diff line number Diff line
@@ -724,8 +724,10 @@ static int replay_fork_event(struct perf_sched *sched, 
{

{

	struct thread *child, *parent;

	struct thread *child, *parent;





	child = machine__findnew_thread(machine, event->fork.tid);

	child = machine__findnew_thread(machine, event->fork.pid,

	parent = machine__findnew_thread(machine, event->fork.ptid);

					event->fork.tid);

	parent = machine__findnew_thread(machine, event->fork.ppid,

					 event->fork.ptid);





	if (child == NULL || parent == NULL) {

	if (child == NULL || parent == NULL) {

		pr_debug("thread does not exist on fork event: child %p, parent %p\n",

		pr_debug("thread does not exist on fork event: child %p, parent %p\n",
@@ -934,8 +936,8 @@ static int latency_switch_event(struct perf_sched *sched, 
		return -1;

		return -1;

	}

	}





	sched_out = machine__findnew_thread(machine, prev_pid);

	sched_out = machine__findnew_thread(machine, 0, prev_pid);

	sched_in = machine__findnew_thread(machine, next_pid);

	sched_in = machine__findnew_thread(machine, 0, next_pid);





	out_events = thread_atoms_search(&sched->atom_root, sched_out, &sched->cmp_pid);

	out_events = thread_atoms_search(&sched->atom_root, sched_out, &sched->cmp_pid);

	if (!out_events) {

	if (!out_events) {
@@ -978,7 +980,7 @@ static int latency_runtime_event(struct perf_sched *sched, 
{

{

	const u32 pid	   = perf_evsel__intval(evsel, sample, "pid");

	const u32 pid	   = perf_evsel__intval(evsel, sample, "pid");

	const u64 runtime  = perf_evsel__intval(evsel, sample, "runtime");

	const u64 runtime  = perf_evsel__intval(evsel, sample, "runtime");

	struct thread *thread = machine__findnew_thread(machine, pid);

	struct thread *thread = machine__findnew_thread(machine, 0, pid);

	struct work_atoms *atoms = thread_atoms_search(&sched->atom_root, thread, &sched->cmp_pid);

	struct work_atoms *atoms = thread_atoms_search(&sched->atom_root, thread, &sched->cmp_pid);

	u64 timestamp = sample->time;

	u64 timestamp = sample->time;

	int cpu = sample->cpu;

	int cpu = sample->cpu;
@@ -1016,7 +1018,7 @@ static int latency_wakeup_event(struct perf_sched *sched, 
	if (!success)

	if (!success)

		return 0;

		return 0;





	wakee = machine__findnew_thread(machine, pid);

	wakee = machine__findnew_thread(machine, 0, pid);

	atoms = thread_atoms_search(&sched->atom_root, wakee, &sched->cmp_pid);

	atoms = thread_atoms_search(&sched->atom_root, wakee, &sched->cmp_pid);

	if (!atoms) {

	if (!atoms) {

		if (thread_atoms_insert(sched, wakee))

		if (thread_atoms_insert(sched, wakee))
@@ -1070,7 +1072,7 @@ static int latency_migrate_task_event(struct perf_sched *sched, 
	if (sched->profile_cpu == -1)

	if (sched->profile_cpu == -1)

		return 0;

		return 0;





	migrant = machine__findnew_thread(machine, pid);

	migrant = machine__findnew_thread(machine, 0, pid);

	atoms = thread_atoms_search(&sched->atom_root, migrant, &sched->cmp_pid);

	atoms = thread_atoms_search(&sched->atom_root, migrant, &sched->cmp_pid);

	if (!atoms) {

	if (!atoms) {

		if (thread_atoms_insert(sched, migrant))

		if (thread_atoms_insert(sched, migrant))
@@ -1289,8 +1291,8 @@ static int map_switch_event(struct perf_sched *sched, struct perf_evsel *evsel, 
		return -1;

		return -1;

	}

	}





	sched_out = machine__findnew_thread(machine, prev_pid);

	sched_out = machine__findnew_thread(machine, 0, prev_pid);

	sched_in = machine__findnew_thread(machine, next_pid);

	sched_in = machine__findnew_thread(machine, 0, next_pid);





	sched->curr_thread[this_cpu] = sched_in;

	sched->curr_thread[this_cpu] = sched_in;

CRA Git | Maintained and supported by SUSTech CRA and CCSE