perf thread: Introduce thread__find_map()

Out of thread__find_add_map(..., MAP__FUNCTION, ...), idea here is to
continue removing references to MAP__{FUNCTION,VARIABLE} ahead of
getting both types of symbols in the same rbtree, as various places do
two lookups, looking first at MAP__FUNCTION, then at MAP__VARIABLE.

So thread__find_map() will eventually do just that, and 'struct symbol'
will have the symbol type, for code that cares about that.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: https://lkml.kernel.org/n/tip-q27xee34l4izpfau49w103s6@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

1 files changed, 9 insertions, 10 deletions

diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c
index e0a9845b6cbc..5ec1c73bbfaf 100644
--- a/tools/perf/builtin-script.c
+++ b/tools/perf/builtin-script.c
@@ -717,8 +717,8 @@ static int perf_sample__fprintf_brstack(struct perf_sample *sample,
                 if (PRINT_FIELD(DSO)) {
                         memset(&alf, 0, sizeof(alf));
                         memset(&alt, 0, sizeof(alt));
-                        thread__find_addr_map(thread, sample->cpumode, MAP__FUNCTION, from, &alf);
-                        thread__find_addr_map(thread, sample->cpumode, MAP__FUNCTION, to, &alt);
+                        thread__find_map(thread, sample->cpumode, from, &alf);
+                        thread__find_map(thread, sample->cpumode, to, &alt);
                 }
 
                 printed += fprintf(fp, " 0x%"PRIx64, from);
@@ -764,11 +764,11 @@ static int perf_sample__fprintf_brstacksym(struct perf_sample *sample,
                 from = br->entries[i].from;
                 to   = br->entries[i].to;
 
-                thread__find_addr_map(thread, sample->cpumode, MAP__FUNCTION, from, &alf);
+                thread__find_map(thread, sample->cpumode, from, &alf);
                 if (alf.map)
                         alf.sym = map__find_symbol(alf.map, alf.addr);
 
-                thread__find_addr_map(thread, sample->cpumode, MAP__FUNCTION, to, &alt);
+                thread__find_map(thread, sample->cpumode, to, &alt);
                 if (alt.map)
                         alt.sym = map__find_symbol(alt.map, alt.addr);
 
@@ -814,11 +814,11 @@ static int perf_sample__fprintf_brstackoff(struct perf_sample *sample,
                 from = br->entries[i].from;
                 to   = br->entries[i].to;
 
-                thread__find_addr_map(thread, sample->cpumode, MAP__FUNCTION, from, &alf);
+                thread__find_map(thread, sample->cpumode, from, &alf);
                 if (alf.map && !alf.map->dso->adjust_symbols)
                         from = map__map_ip(alf.map, from);
 
-                thread__find_addr_map(thread, sample->cpumode, MAP__FUNCTION, to, &alt);
+                thread__find_map(thread, sample->cpumode, to, &alt);
                 if (alt.map && !alt.map->dso->adjust_symbols)
                         to = map__map_ip(alt.map, to);
 
@@ -882,7 +882,7 @@ static int grab_bb(u8 *buffer, u64 start, u64 end,
                 return 0;
         }
 
-        thread__find_addr_map(thread, *cpumode, MAP__FUNCTION, start, &al);
+        thread__find_map(thread, *cpumode, start, &al);
         if (!al.map || !al.map->dso) {
                 pr_debug("\tcannot resolve %" PRIx64 "-%" PRIx64 "\n", start, end);
                 return 0;
@@ -933,10 +933,9 @@ static int ip__fprintf_sym(uint64_t addr, struct thread *thread,
 
         memset(&al, 0, sizeof(al));
 
-        thread__find_addr_map(thread, cpumode, MAP__FUNCTION, addr, &al);
+        thread__find_map(thread, cpumode, addr, &al);
         if (!al.map)
-                thread__find_addr_map(thread, cpumode, MAP__VARIABLE,
-                                      addr, &al);
+                __thread__find_map(thread, cpumode, MAP__VARIABLE, addr, &al);
         if ((*lastsym) && al.addr >= (*lastsym)->start && al.addr < (*lastsym)->end)
                 return 0;