[PATCH v5 06/17] perf map: Rename map_ip and unmap_ip

Ian Rogers
2023-03-20T21:24:57Z

Add dso to match comment. This avoids a naming conflict with later
added accessor functions for variables in struct map.

Signed-off-by: Ian Rogers <irogers@google.com>
---
tools/perf/builtin-kmem.c | 2 +-
tools/perf/builtin-script.c | 4 ++--
tools/perf/util/machine.c | 4 ++--
tools/perf/util/map.c | 8 ++++----
tools/perf/util/map.h | 4 ++--
tools/perf/util/symbol-elf.c | 4 ++--
6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/tools/perf/builtin-kmem.c b/tools/perf/builtin-kmem.c
index f3029742b800..4d4b770a401c 100644
--- a/tools/perf/builtin-kmem.c
+++ b/tools/perf/builtin-kmem.c
@@ -423,7 +423,7 @@ static u64 find_callsite(struct evsel *evsel, struct perf_sample *sample)
if (!caller) {
/* found */
if (node->ms.map)
- addr = map__unmap_ip(node->ms.map, node->ip);
+ addr = map__dso_unmap_ip(node->ms.map, node->ip);
else
addr = node->ip;

diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c
index eb49689d0f00..21944adf4c17 100644
--- a/tools/perf/builtin-script.c
+++ b/tools/perf/builtin-script.c
@@ -1012,11 +1012,11 @@ static int perf_sample__fprintf_brstackoff(struct perf_sample *sample,

if (thread__find_map_fb(thread, sample->cpumode, from, &alf) &&
!map__dso(alf.map)->adjust_symbols)
- from = map__map_ip(alf.map, from);
+ from = map__dso_map_ip(alf.map, from);

if (thread__find_map_fb(thread, sample->cpumode, to, &alt) &&
!map__dso(alt.map)->adjust_symbols)
- to = map__map_ip(alt.map, to);
+ to = map__dso_map_ip(alt.map, to);

printed += fprintf(fp, " 0x%"PRIx64, from);
if (PRINT_FIELD(DSO)) {
diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c
index 08fb3ab0c205..5bf035b23a79 100644
--- a/tools/perf/util/machine.c
+++ b/tools/perf/util/machine.c
@@ -3053,7 +3053,7 @@ static int append_inlines(struct callchain_cursor *cursor, struct map_symbol *ms
if (!symbol_conf.inline_name || !map || !sym)
return ret;

- addr = map__map_ip(map, ip);
+ addr = map__dso_map_ip(map, ip);
addr = map__rip_2objdump(map, addr);
dso = map__dso(map);

@@ -3098,7 +3098,7 @@ static int unwind_entry(struct unwind_entry *entry, void *arg)
* its corresponding binary.
*/
if (entry->ms.map)
- addr = map__map_ip(entry->ms.map, entry->ip);
+ addr = map__dso_map_ip(entry->ms.map, entry->ip);

srcline = callchain_srcline(&entry->ms, addr);
return callchain_cursor_append(cursor, entry->ip, &entry->ms,
diff --git a/tools/perf/util/map.c b/tools/perf/util/map.c
index 416fc449bde8..d97a6d20626f 100644
--- a/tools/perf/util/map.c
+++ b/tools/perf/util/map.c
@@ -109,8 +109,8 @@ void map__init(struct map *map, u64 start, u64 end, u64 pgoff, struct dso *dso)
map->pgoff = pgoff;
map->reloc = 0;
map->dso = dso__get(dso);
- map->map_ip = map__map_ip;
- map->unmap_ip = map__unmap_ip;
+ map->map_ip = map__dso_map_ip;
+ map->unmap_ip = map__dso_unmap_ip;
map->erange_warned = false;
refcount_set(&map->refcnt, 1);
}
@@ -590,12 +590,12 @@ struct maps *map__kmaps(struct map *map)
return kmap->kmaps;
}

-u64 map__map_ip(const struct map *map, u64 ip)
+u64 map__dso_map_ip(const struct map *map, u64 ip)
{
return ip - map__start(map) + map->pgoff;
}

-u64 map__unmap_ip(const struct map *map, u64 ip)
+u64 map__dso_unmap_ip(const struct map *map, u64 ip)
{
return ip + map__start(map) - map->pgoff;
}
diff --git a/tools/perf/util/map.h b/tools/perf/util/map.h
index 16646b94fa3a..9b0a84e46e48 100644
--- a/tools/perf/util/map.h
+++ b/tools/perf/util/map.h
@@ -41,9 +41,9 @@ struct kmap *map__kmap(struct map *map);
struct maps *map__kmaps(struct map *map);

/* ip -> dso rip */
-u64 map__map_ip(const struct map *map, u64 ip);
+u64 map__dso_map_ip(const struct map *map, u64 ip);
/* dso rip -> ip */
-u64 map__unmap_ip(const struct map *map, u64 ip);
+u64 map__dso_unmap_ip(const struct map *map, u64 ip);
/* Returns ip */
u64 identity__map_ip(const struct map *map __maybe_unused, u64 ip);

diff --git a/tools/perf/util/symbol-elf.c b/tools/perf/util/symbol-elf.c
index 0542985ecaf6..93ae3f22fd03 100644
--- a/tools/perf/util/symbol-elf.c
+++ b/tools/perf/util/symbol-elf.c
@@ -1351,8 +1351,8 @@ static int dso__process_kernel_symbol(struct dso *dso, struct map *map,
map->start = shdr->sh_addr + ref_reloc(kmap);
map->end = map__start(map) + shdr->sh_size;
map->pgoff = shdr->sh_offset;
- map->map_ip = map__map_ip;
- map->unmap_ip = map__unmap_ip;
+ map->map_ip = map__dso_map_ip;
+ map->unmap_ip = map__dso_unmap_ip;
/* Ensure maps are correctly ordered */
if (kmaps) {
int err;
--
2.40.0.rc1.284.g88254d51c5-goog