perf tools: Use tid for finding thread

PATCH New Namhyung Kim 2 participants 2 messages May 12, 2014 perf events

Share & tools

Namhyung Kim

author maintainer

2014-05-12 00:56 UTC #0 lore raw

PATCH v2 1/1 perf tools: Use tid for finding thread

I believe that passing pid (instead of tid) as the 3rd arg of the machine__find*_thread() was to find a main thread so that it can search proper map group for symbols. However with the map sharing patch applied, it now can do it in any thread.

It fixes a bug when each thread has different name, it only reports a main thread for samples in other threads.

Cc Adrian Hunter <[email protected]>

Acked-by David Ahern <[email protected]>

Acked-by Stephane Eranian <[email protected]>

Signed-off-by Namhyung Kim <[email protected]>

---
 tools/perf/builtin-inject.c     | 2 +-
 tools/perf/builtin-kmem.c       | 2 +-
 tools/perf/tests/code-reading.c | 2 +-
 tools/perf/tests/hists_filter.c | 1 +
 tools/perf/tests/hists_link.c   | 2 ++
 tools/perf/util/build-id.c      | 2 +-
 tools/perf/util/event.c         | 2 +-
 7 files changed, 8 insertions(+), 5 deletions(-)

tools/perf/builtin-inject.c +1 -1

index 3a7387551369..6a3af0013d68 100644
@@ -209,7 +209,7 @@ static int perf_event__inject_buildid(struct perf_tool *tool,
 
 	cpumode = event->header.misc & PERF_RECORD_MISC_CPUMODE_MASK;
 
-	thread = machine__findnew_thread(machine, sample->pid, sample->pid);
+	thread = machine__findnew_thread(machine, sample->pid, sample->tid);
 	if (thread == NULL) {
 		pr_err("problem processing %d event, skipping it.\n",
 		       event->header.type);

tools/perf/builtin-kmem.c +1 -1

index f91fa4376f4b..bef3376bfaf3 100644
@@ -235,7 +235,7 @@ static int process_sample_event(struct perf_tool *tool __maybe_unused,
 				struct machine *machine)
 {
 	struct thread *thread = machine__findnew_thread(machine, sample->pid,
-							sample->pid);
+							sample->tid);
 
 	if (thread == NULL) {
 		pr_debug("problem processing %d event, skipping it.\n",

tools/perf/tests/code-reading.c +1 -1

index adf3de3e38d6..67f2d6323558 100644
@@ -256,7 +256,7 @@ static int process_sample_event(struct machine *machine,
 		return -1;
 	}
 
-	thread = machine__findnew_thread(machine, sample.pid, sample.pid);
+	thread = machine__findnew_thread(machine, sample.pid, sample.tid);
 	if (!thread) {
 		pr_debug("machine__findnew_thread failed\n");
 		return -1;

tools/perf/tests/hists_filter.c +1 -0

index 23dc2f4d12c3..4617a8bee29b 100644
@@ -69,6 +69,7 @@ static int add_hist_entries(struct perf_evlist *evlist, struct machine *machine)
 			evsel->hists.symbol_filter_str = NULL;
 
 			sample.pid = fake_samples[i].pid;
+			sample.tid = fake_samples[i].pid;
 			sample.ip = fake_samples[i].ip;
 
 			if (perf_event__preprocess_sample(&event, machine, &al,

tools/perf/tests/hists_link.c +2 -0

index e42d6790811a..b009bbf440d9 100644
@@ -81,6 +81,7 @@ static int add_hist_entries(struct perf_evlist *evlist, struct machine *machine)
 			};
 
 			sample.pid = fake_common_samples[k].pid;
+			sample.tid = fake_common_samples[k].pid;
 			sample.ip = fake_common_samples[k].ip;
 			if (perf_event__preprocess_sample(&event, machine, &al,
 							  &sample) < 0)

@@ -104,6 +105,7 @@ static int add_hist_entries(struct perf_evlist *evlist, struct machine *machine)
 			};
 
 			sample.pid = fake_samples[i][k].pid;
+			sample.tid = fake_samples[i][k].pid;
 			sample.ip = fake_samples[i][k].ip;
 			if (perf_event__preprocess_sample(&event, machine, &al,
 							  &sample) < 0)

tools/perf/util/build-id.c +1 -1

index 6baabe63182b..a904a4cfe7d3 100644
@@ -25,7 +25,7 @@ int build_id__mark_dso_hit(struct perf_tool *tool __maybe_unused,
 	struct addr_location al;
 	u8 cpumode = event->header.misc & PERF_RECORD_MISC_CPUMODE_MASK;
 	struct thread *thread = machine__findnew_thread(machine, sample->pid,
-							sample->pid);
+							sample->tid);
 
 	if (thread == NULL) {
 		pr_err("problem processing %d event, skipping it.\n",

tools/perf/util/event.c +1 -1

index dbcaea1a8180..65795b835b39 100644
@@ -788,7 +788,7 @@ int perf_event__preprocess_sample(const union perf_event *event,
 {
 	u8 cpumode = event->header.misc & PERF_RECORD_MISC_CPUMODE_MASK;
 	struct thread *thread = machine__findnew_thread(machine, sample->pid,
-							sample->pid);
+							sample->tid);
 
 	if (thread == NULL)
 		return -1;

Signature · 1 line

1.9.2

tip-bot for Namhyung Kim

merge bot

2014-05-12 16:02 UTC #1 lore raw

perf tools: Use tid for finding thread

Commit-ID:  13ce34df11833482cd698331fdbb3f8ced06340d
Gitweb:     http://git.kernel.org/tip/13ce34df11833482cd698331fdbb3f8ced06340d
Author:     Namhyung Kim <[email protected]>
AuthorDate: Mon, 12 May 2014 09:56:42 +0900
Committer:  Jiri Olsa <[email protected]>
CommitDate: Mon, 12 May 2014 11:09:50 +0200

perf tools: Use tid for finding thread

It fixes a bug when each thread has different name, it only reports a main thread for samples in other threads.

Cc Adrian Hunter <[email protected]>

Acked-by David Ahern <[email protected]>

Acked-by Stephane Eranian <[email protected]>

Signed-off-by Namhyung Kim <[email protected]>

Link http://lkml.kernel.org/r/[email protected] open here

Signed-off-by Jiri Olsa <[email protected]>

---
 tools/perf/builtin-inject.c     | 2 +-
 tools/perf/builtin-kmem.c       | 2 +-
 tools/perf/tests/code-reading.c | 2 +-
 tools/perf/tests/hists_filter.c | 1 +
 tools/perf/tests/hists_link.c   | 2 ++
 tools/perf/util/build-id.c      | 2 +-
 tools/perf/util/event.c         | 2 +-
 7 files changed, 8 insertions(+), 5 deletions(-)

tools/perf/builtin-inject.c +1 -1

index 3a73875..6a3af00 100644
@@ -209,7 +209,7 @@ static int perf_event__inject_buildid(struct perf_tool *tool,
 
 	cpumode = event->header.misc & PERF_RECORD_MISC_CPUMODE_MASK;
 
-	thread = machine__findnew_thread(machine, sample->pid, sample->pid);
+	thread = machine__findnew_thread(machine, sample->pid, sample->tid);
 	if (thread == NULL) {
 		pr_err("problem processing %d event, skipping it.\n",
 		       event->header.type);

tools/perf/builtin-kmem.c +1 -1

index f91fa437..bef3376 100644
@@ -235,7 +235,7 @@ static int process_sample_event(struct perf_tool *tool __maybe_unused,
 				struct machine *machine)
 {
 	struct thread *thread = machine__findnew_thread(machine, sample->pid,
-							sample->pid);
+							sample->tid);
 
 	if (thread == NULL) {
 		pr_debug("problem processing %d event, skipping it.\n",

tools/perf/tests/code-reading.c +1 -1

index adf3de3..67f2d63 100644
@@ -256,7 +256,7 @@ static int process_sample_event(struct machine *machine,
 		return -1;
 	}
 
-	thread = machine__findnew_thread(machine, sample.pid, sample.pid);
+	thread = machine__findnew_thread(machine, sample.pid, sample.tid);
 	if (!thread) {
 		pr_debug("machine__findnew_thread failed\n");
 		return -1;

tools/perf/tests/hists_filter.c +1 -0

index 23dc2f4..4617a8b 100644
@@ -69,6 +69,7 @@ static int add_hist_entries(struct perf_evlist *evlist, struct machine *machine)
 			evsel->hists.symbol_filter_str = NULL;
 
 			sample.pid = fake_samples[i].pid;
+			sample.tid = fake_samples[i].pid;
 			sample.ip = fake_samples[i].ip;
 
 			if (perf_event__preprocess_sample(&event, machine, &al,

tools/perf/tests/hists_link.c +2 -0

index e42d679..b009bbf 100644
@@ -81,6 +81,7 @@ static int add_hist_entries(struct perf_evlist *evlist, struct machine *machine)
 			};
 
 			sample.pid = fake_common_samples[k].pid;
+			sample.tid = fake_common_samples[k].pid;
 			sample.ip = fake_common_samples[k].ip;
 			if (perf_event__preprocess_sample(&event, machine, &al,
 							  &sample) < 0)

@@ -104,6 +105,7 @@ static int add_hist_entries(struct perf_evlist *evlist, struct machine *machine)
 			};
 
 			sample.pid = fake_samples[i][k].pid;
+			sample.tid = fake_samples[i][k].pid;
 			sample.ip = fake_samples[i][k].ip;
 			if (perf_event__preprocess_sample(&event, machine, &al,
 							  &sample) < 0)

tools/perf/util/build-id.c +1 -1

index 6baabe6..a904a4c 100644
@@ -25,7 +25,7 @@ int build_id__mark_dso_hit(struct perf_tool *tool __maybe_unused,
 	struct addr_location al;
 	u8 cpumode = event->header.misc & PERF_RECORD_MISC_CPUMODE_MASK;
 	struct thread *thread = machine__findnew_thread(machine, sample->pid,
-							sample->pid);
+							sample->tid);
 
 	if (thread == NULL) {
 		pr_err("problem processing %d event, skipping it.\n",

tools/perf/util/event.c +1 -1

index dbcaea1..65795b8 100644
@@ -788,7 +788,7 @@ int perf_event__preprocess_sample(const union perf_event *event,
 {
 	u8 cpumode = event->header.misc & PERF_RECORD_MISC_CPUMODE_MASK;
 	struct thread *thread = machine__findnew_thread(machine, sample->pid,
-							sample->pid);
+							sample->tid);
 
 	if (thread == NULL)
 		return -1;