perf machine: Rename perf_event__preprocess_sample to machine__resolve

Since we only deal with fields in the passed struct perf_sample move
this method to struct machine, that is where the perf_sample fields
will be resolved to a struct addr_location, i.e. thread, map, symbol,
etc.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Hemant Kumar <hemant@linux.vnet.ibm.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>
Cc: Ravi Bangoria <ravi.bangoria@linux.vnet.ibm.com>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/n/tip-a1ww2lbm2vbuqsv4p7ilubu9@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

13 files changed, 17 insertions, 52 deletions

diff --git a/tools/perf/builtin-annotate.c b/tools/perf/builtin-annotate.c
index cfe366375c4b..814158393656 100644
--- a/tools/perf/builtin-annotate.c
+++ b/tools/perf/builtin-annotate.c
@@ -94,7 +94,7 @@ static int process_sample_event(struct perf_tool *tool,
         struct addr_location al;
         int ret = 0;
 
-        if (perf_event__preprocess_sample(event, machine, &al, sample) < 0) {
+        if (machine__resolve(machine, &al, sample) < 0) {
                 pr_warning("problem processing %d event, skipping it.\n",
                            event->header.type);
                 return -1;
diff --git a/tools/perf/builtin-diff.c b/tools/perf/builtin-diff.c
index 4d72359fd15a..8053a8ceefda 100644
--- a/tools/perf/builtin-diff.c
+++ b/tools/perf/builtin-diff.c
@@ -330,7 +330,7 @@ static int diff__process_sample_event(struct perf_tool *tool __maybe_unused,
         struct hists *hists = evsel__hists(evsel);
         int ret = -1;
 
-        if (perf_event__preprocess_sample(event, machine, &al, sample) < 0) {
+        if (machine__resolve(machine, &al, sample) < 0) {
                 pr_warning("problem processing %d event, skipping it.\n",
                            event->header.type);
                 return -1;
diff --git a/tools/perf/builtin-mem.c b/tools/perf/builtin-mem.c
index 88aeac9aa1da..85db3be4b3cb 100644
--- a/tools/perf/builtin-mem.c
+++ b/tools/perf/builtin-mem.c
@@ -131,7 +131,7 @@ dump_raw_samples(struct perf_tool *tool,
         struct addr_location al;
         const char *fmt;
 
-        if (perf_event__preprocess_sample(event, machine, &al, sample) < 0) {
+        if (machine__resolve(machine, &al, sample) < 0) {
                 fprintf(stderr, "problem processing %d event, skipping it.\n",
                                 event->header.type);
                 return -1;
diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c
index 7eea49f9ed46..ab47273a5373 100644
--- a/tools/perf/builtin-report.c
+++ b/tools/perf/builtin-report.c
@@ -154,7 +154,7 @@ static int process_sample_event(struct perf_tool *tool,
         };
         int ret = 0;
 
-        if (perf_event__preprocess_sample(event, machine, &al, sample) < 0) {
+        if (machine__resolve(machine, &al, sample) < 0) {
                 pr_debug("problem processing %d event, skipping it.\n",
                          event->header.type);
                 return -1;
diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c
index 928a4411e023..02a65d15c594 100644
--- a/tools/perf/builtin-script.c
+++ b/tools/perf/builtin-script.c
@@ -904,7 +904,7 @@ static int process_sample_event(struct perf_tool *tool,
                 return 0;
         }
 
-        if (perf_event__preprocess_sample(event, machine, &al, sample) < 0) {
+        if (machine__resolve(machine, &al, sample) < 0) {
                 pr_err("problem processing %d event, skipping it.\n",
                        event->header.type);
                 return -1;
diff --git a/tools/perf/builtin-timechart.c b/tools/perf/builtin-timechart.c
index bd7a7757176f..40cc9bb3506c 100644
--- a/tools/perf/builtin-timechart.c
+++ b/tools/perf/builtin-timechart.c
@@ -489,7 +489,7 @@ static const char *cat_backtrace(union perf_event *event,
         if (!chain)
                 goto exit;
 
-        if (perf_event__preprocess_sample(event, machine, &al, sample) < 0) {
+        if (machine__resolve(machine, &al, sample) < 0) {
                 fprintf(stderr, "problem processing %d event, skipping it.\n",
                         event->header.type);
                 goto exit;
diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c
index a287800bc495..9b0f2df2faa0 100644
--- a/tools/perf/builtin-top.c
+++ b/tools/perf/builtin-top.c
@@ -728,7 +728,7 @@ static void perf_event__process_sample(struct perf_tool *tool,
         if (event->header.misc & PERF_RECORD_MISC_EXACT_IP)
                 top->exact_samples++;
 
-        if (perf_event__preprocess_sample(event, machine, &al, sample) < 0)
+        if (machine__resolve(machine, &al, sample) < 0)
                 return;
 
         if (!top->kptr_restrict_warned &&
diff --git a/tools/perf/tests/hists_cumulate.c b/tools/perf/tests/hists_cumulate.c
index cf7eef73fbe6..ed5aa9eaeb6c 100644
--- a/tools/perf/tests/hists_cumulate.c
+++ b/tools/perf/tests/hists_cumulate.c
@@ -81,11 +81,6 @@ static int add_hist_entries(struct hists *hists, struct machine *machine)
         size_t i;
 
         for (i = 0; i < ARRAY_SIZE(fake_samples); i++) {
-                const union perf_event event = {
-                        .header = {
-                                .misc = PERF_RECORD_MISC_USER,
-                        },
-                };
                 struct hist_entry_iter iter = {
                         .evsel = evsel,
                         .sample = &sample,
@@ -103,8 +98,7 @@ static int add_hist_entries(struct hists *hists, struct machine *machine)
                 sample.ip = fake_samples[i].ip;
                 sample.callchain = (struct ip_callchain *)fake_callchains[i];
 
-                if (perf_event__preprocess_sample(&event, machine, &al,
-                                                  &sample) < 0)
+                if (machine__resolve(machine, &al, &sample) < 0)
                         goto out;
 
                 if (hist_entry_iter__add(&iter, &al, PERF_MAX_STACK_DEPTH,
diff --git a/tools/perf/tests/hists_filter.c b/tools/perf/tests/hists_filter.c
index 1c9e19352cb6..b825d24f8186 100644
--- a/tools/perf/tests/hists_filter.c
+++ b/tools/perf/tests/hists_filter.c
@@ -58,11 +58,6 @@ static int add_hist_entries(struct perf_evlist *evlist,
          */
         evlist__for_each(evlist, evsel) {
                 for (i = 0; i < ARRAY_SIZE(fake_samples); i++) {
-                        const union perf_event event = {
-                                .header = {
-                                        .misc = PERF_RECORD_MISC_USER,
-                                },
-                        };
                         struct hist_entry_iter iter = {
                                 .evsel = evsel,
                                 .sample = &sample,
@@ -81,8 +76,7 @@ static int add_hist_entries(struct perf_evlist *evlist,
                         sample.tid = fake_samples[i].pid;
                         sample.ip = fake_samples[i].ip;
 
-                        if (perf_event__preprocess_sample(&event, machine, &al,
-                                                          &sample) < 0)
+                        if (machine__resolve(machine, &al, &sample) < 0)
                                 goto out;
 
                         al.socket = fake_samples[i].socket;
diff --git a/tools/perf/tests/hists_link.c b/tools/perf/tests/hists_link.c
index 7885b1d324e4..358324e47805 100644
--- a/tools/perf/tests/hists_link.c
+++ b/tools/perf/tests/hists_link.c
@@ -76,18 +76,12 @@ static int add_hist_entries(struct perf_evlist *evlist, struct machine *machine)
                 struct hists *hists = evsel__hists(evsel);
 
                 for (k = 0; k < ARRAY_SIZE(fake_common_samples); k++) {
-                        const union perf_event event = {
-                                .header = {
-                                        .misc = PERF_RECORD_MISC_USER,
-                                },
-                        };
-
                         sample.cpumode = PERF_RECORD_MISC_USER;
                         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)
+
+                        if (machine__resolve(machine, &al, &sample) < 0)
                                 goto out;
 
                         he = __hists__add_entry(hists, &al, NULL,
@@ -103,17 +97,10 @@ static int add_hist_entries(struct perf_evlist *evlist, struct machine *machine)
                 }
 
                 for (k = 0; k < ARRAY_SIZE(fake_samples[i]); k++) {
-                        const union perf_event event = {
-                                .header = {
-                                        .misc = PERF_RECORD_MISC_USER,
-                                },
-                        };
-
                         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)
+                        if (machine__resolve(machine, &al, &sample) < 0)
                                 goto out;
 
                         he = __hists__add_entry(hists, &al, NULL,
diff --git a/tools/perf/tests/hists_output.c b/tools/perf/tests/hists_output.c
index 03e4e9c47a55..d3556fbe8c5c 100644
--- a/tools/perf/tests/hists_output.c
+++ b/tools/perf/tests/hists_output.c
@@ -51,11 +51,6 @@ static int add_hist_entries(struct hists *hists, struct machine *machine)
         size_t i;
 
         for (i = 0; i < ARRAY_SIZE(fake_samples); i++) {
-                const union perf_event event = {
-                        .header = {
-                                .misc = PERF_RECORD_MISC_USER,
-                        },
-                };
                 struct hist_entry_iter iter = {
                         .evsel = evsel,
                         .sample = &sample,
@@ -69,8 +64,7 @@ static int add_hist_entries(struct hists *hists, struct machine *machine)
                 sample.tid = fake_samples[i].pid;
                 sample.ip = fake_samples[i].ip;
 
-                if (perf_event__preprocess_sample(&event, machine, &al,
-                                                  &sample) < 0)
+                if (machine__resolve(machine, &al, &sample) < 0)
                         goto out;
 
                 if (hist_entry_iter__add(&iter, &al, PERF_MAX_STACK_DEPTH,
diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c
index f679caac12d0..a89c29e2e0a9 100644
--- a/tools/perf/util/event.c
+++ b/tools/perf/util/event.c
@@ -1295,10 +1295,8 @@ void thread__find_addr_location(struct thread *thread,
  * Callers need to drop the reference to al->thread, obtained in
  * machine__findnew_thread()
  */
-int perf_event__preprocess_sample(const union perf_event *event __maybe_unused,
-                                  struct machine *machine,
-                                  struct addr_location *al,
-                                  struct perf_sample *sample)
+int machine__resolve(struct machine *machine, struct addr_location *al,
+                     struct perf_sample *sample)
 {
         struct thread *thread = machine__findnew_thread(machine, sample->pid,
                                                         sample->tid);
diff --git a/tools/perf/util/event.h b/tools/perf/util/event.h
index f5a2e67c86aa..22921fd0f5b8 100644
--- a/tools/perf/util/event.h
+++ b/tools/perf/util/event.h
@@ -598,10 +598,8 @@ int perf_event__process(struct perf_tool *tool,
 
 struct addr_location;
 
-int perf_event__preprocess_sample(const union perf_event *event,
-                                  struct machine *machine,
-                                  struct addr_location *al,
-                                  struct perf_sample *sample);
+int machine__resolve(struct machine *machine, struct addr_location *al,
+                     struct perf_sample *sample);
 
 void addr_location__put(struct addr_location *al);