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]>
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Jiri Olsa <[email protected]>

diff --git a/tools/perf/builtin-inject.c b/tools/perf/builtin-inject.c
index 3a7387551369c97ab38b249ced193cc386c2cabe..6a3af0013d68c860e93dc1fc29b291f14f227b56 100644 (file)
--- a/tools/perf/builtin-inject.c
+++ b/tools/perf/builtin-inject.c
@@ -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);

diff --git a/tools/perf/builtin-kmem.c b/tools/perf/builtin-kmem.c
index f91fa4376f4b4545b8d7418de304f4838866b9df..bef3376bfaf3a6e093a227fddb15e6cbf7ffbd7f 100644 (file)
--- a/tools/perf/builtin-kmem.c
+++ b/tools/perf/builtin-kmem.c
@@ -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",

diff --git a/tools/perf/tests/code-reading.c b/tools/perf/tests/code-reading.c
index adf3de3e38d6a9ad04d85487ef497c5df00f5df6..67f2d63235587be7a6c3b7725727d28c1d4022f0 100644 (file)
--- a/tools/perf/tests/code-reading.c
+++ b/tools/perf/tests/code-reading.c
@@ -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;

diff --git a/tools/perf/tests/hists_filter.c b/tools/perf/tests/hists_filter.c
index 23dc2f4d12c33270d1802333d6026fc3351bb955..4617a8bee29b431a494e1d5950b51765cca5ab19 100644 (file)
--- a/tools/perf/tests/hists_filter.c
+++ b/tools/perf/tests/hists_filter.c
@@ -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,

diff --git a/tools/perf/tests/hists_link.c b/tools/perf/tests/hists_link.c
index e42d6790811afc93640989fd94af8ec094834bf4..b009bbf440d968ffea5eef026e6ce2645a628b20 100644 (file)
--- a/tools/perf/tests/hists_link.c
+++ b/tools/perf/tests/hists_link.c
@@ -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)

diff --git a/tools/perf/util/build-id.c b/tools/perf/util/build-id.c
index 6baabe63182ba1b79a7a3c19c954b1a213da2c30..a904a4cfe7d3902e0a8075cc34285c7bc9cf1318 100644 (file)
--- a/tools/perf/util/build-id.c
+++ b/tools/perf/util/build-id.c
@@ -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",

diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c
index dbcaea1a81809aad515ba5d603f2803f555db373..65795b835b393994e46a757957a99ddd9ea64d44 100644 (file)
--- a/tools/perf/util/event.c
+++ b/tools/perf/util/event.c
@@ -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;