perf thread: Rename perf_event__preprocess_sample_addr to thread__resolve

Since none of the perf_event fields are used anymore, just the
perf_sample ones, and since this resolves to (map, symbol) from data
structures within struct thread, rename it to thread__resolve and make
the argument ordering similar to the one in machine__resolve().

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-2b33hs9bp550tezzlhl4kejh@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c
index 02a65d15c594785aeb9007e56b12edc4331f1ee7..4bc92070363bce0da0f7c31af8d52db2955661cc 100644 (file)
--- a/tools/perf/builtin-script.c
+++ b/tools/perf/builtin-script.c
@@ -537,7 +537,7 @@ static void print_sample_brstacksym(union perf_event *event __maybe_unused,
 }
 
 
-static void print_sample_addr(union perf_event *event,
+static void print_sample_addr(union perf_event *event __maybe_unused,
                          struct perf_sample *sample,
                          struct thread *thread,
                          struct perf_event_attr *attr)
@@ -549,7 +549,7 @@ static void print_sample_addr(union perf_event *event,
        if (!sample_addr_correlates_sym(attr))
                return;
 
-       perf_event__preprocess_sample_addr(event, sample, thread, &al);
+       thread__resolve(thread, &al, sample);
 
        if (PRINT_FIELD(SYM)) {
                printf(" ");

diff --git a/tools/perf/util/db-export.c b/tools/perf/util/db-export.c
index 1c9689e4cc179a3e931e1b3e0b427accb7553cba..049438d51b9a496cd20dac37c63a41a0b3512a6a 100644 (file)
--- a/tools/perf/util/db-export.c
+++ b/tools/perf/util/db-export.c
@@ -333,7 +333,7 @@ int db_export__sample(struct db_export *dbe, union perf_event *event,
            sample_addr_correlates_sym(&evsel->attr)) {
                struct addr_location addr_al;
 
-               perf_event__preprocess_sample_addr(event, sample, thread, &addr_al);
+               thread__resolve(thread, &addr_al, sample);
                err = db_ids_from_al(dbe, &addr_al, &es.addr_dso_db_id,
                                     &es.addr_sym_db_id, &es.addr_offset);
                if (err)

diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c
index a89c29e2e0a97dc2b9c955e8f7ca5aa2ac70df9b..52cf479bc5935d3f74edbf7d3c8733d4191e268a 100644 (file)
--- a/tools/perf/util/event.c
+++ b/tools/perf/util/event.c
@@ -1392,10 +1392,8 @@ bool sample_addr_correlates_sym(struct perf_event_attr *attr)
        return false;
 }
 
-void perf_event__preprocess_sample_addr(union perf_event *event __maybe_unused,
-                                       struct perf_sample *sample,
-                                       struct thread *thread,
-                                       struct addr_location *al)
+void thread__resolve(struct thread *thread, struct addr_location *al,
+                    struct perf_sample *sample)
 {
        thread__find_addr_map(thread, sample->cpumode, MAP__FUNCTION, sample->addr, al);
        if (!al->map)

diff --git a/tools/perf/util/event.h b/tools/perf/util/event.h
index 22921fd0f5b8c44e2021f66dab513a6bf19b7d5e..6bb1c928350d414f8cc157c1c1a608ab4ac6c8ee 100644 (file)
--- a/tools/perf/util/event.h
+++ b/tools/perf/util/event.h
@@ -607,10 +607,8 @@ struct thread;
 
 bool is_bts_event(struct perf_event_attr *attr);
 bool sample_addr_correlates_sym(struct perf_event_attr *attr);
-void perf_event__preprocess_sample_addr(union perf_event *event,
-                                       struct perf_sample *sample,
-                                       struct thread *thread,
-                                       struct addr_location *al);
+void thread__resolve(struct thread *thread, struct addr_location *al,
+                    struct perf_sample *sample);
 
 const char *perf_event__name(unsigned int id);