perf map: Shorten map_groups__find() signature

Removing the map_type, that is going away.

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

diff --git a/tools/perf/arch/arm/tests/dwarf-unwind.c b/tools/perf/arch/arm/tests/dwarf-unwind.c
index 8cb3477602339e9b94f30bb1edb2175e3828e570..7d7a65ca2e8da793fe020c16261dfd40b352e16d 100644 (file)
--- a/tools/perf/arch/arm/tests/dwarf-unwind.c
+++ b/tools/perf/arch/arm/tests/dwarf-unwind.c
@@ -25,7 +25,7 @@ static int sample_ustack(struct perf_sample *sample,
 
        sp = (unsigned long) regs[PERF_REG_ARM_SP];
 
-       map = map_groups__find(thread->mg, MAP__VARIABLE, (u64) sp);
+       map = __map_groups__find(thread->mg, MAP__VARIABLE, (u64) sp);
        if (!map) {
                pr_debug("failed to get stack map\n");
                free(buf);

diff --git a/tools/perf/arch/arm64/tests/dwarf-unwind.c b/tools/perf/arch/arm64/tests/dwarf-unwind.c
index e907f0f4c20c0c34c1806dd636990ed452f5d6b0..f053eae3b6eb6b2231d45f28f9e9e0a20a9bd1c4 100644 (file)
--- a/tools/perf/arch/arm64/tests/dwarf-unwind.c
+++ b/tools/perf/arch/arm64/tests/dwarf-unwind.c
@@ -25,7 +25,7 @@ static int sample_ustack(struct perf_sample *sample,
 
        sp = (unsigned long) regs[PERF_REG_ARM64_SP];
 
-       map = map_groups__find(thread->mg, MAP__VARIABLE, (u64) sp);
+       map = __map_groups__find(thread->mg, MAP__VARIABLE, (u64) sp);
        if (!map) {
                pr_debug("failed to get stack map\n");
                free(buf);

diff --git a/tools/perf/arch/powerpc/tests/dwarf-unwind.c b/tools/perf/arch/powerpc/tests/dwarf-unwind.c
index 30cbbd6d5be0c9a1aa337a350387f420eefb3068..b22d643cb602a1897b4c62c99ffe60658af1438d 100644 (file)
--- a/tools/perf/arch/powerpc/tests/dwarf-unwind.c
+++ b/tools/perf/arch/powerpc/tests/dwarf-unwind.c
@@ -26,7 +26,7 @@ static int sample_ustack(struct perf_sample *sample,
 
        sp = (unsigned long) regs[PERF_REG_POWERPC_R1];
 
-       map = map_groups__find(thread->mg, MAP__VARIABLE, (u64) sp);
+       map = __map_groups__find(thread->mg, MAP__VARIABLE, (u64) sp);
        if (!map) {
                pr_debug("failed to get stack map\n");
                free(buf);

diff --git a/tools/perf/arch/x86/tests/dwarf-unwind.c b/tools/perf/arch/x86/tests/dwarf-unwind.c
index 95036c7a59e8f5ab53e723d801c23873e38b7a9a..7da845026323d9b65980adb644e0404074287580 100644 (file)
--- a/tools/perf/arch/x86/tests/dwarf-unwind.c
+++ b/tools/perf/arch/x86/tests/dwarf-unwind.c
@@ -26,7 +26,7 @@ static int sample_ustack(struct perf_sample *sample,
 
        sp = (unsigned long) regs[PERF_REG_X86_SP];
 
-       map = map_groups__find(thread->mg, MAP__VARIABLE, (u64) sp);
+       map = __map_groups__find(thread->mg, MAP__VARIABLE, (u64) sp);
        if (!map) {
                pr_debug("failed to get stack map\n");
                free(buf);

diff --git a/tools/perf/tests/vmlinux-kallsyms.c b/tools/perf/tests/vmlinux-kallsyms.c
index a99b0c118541807eeaa04ab0295e658649175b95..702cea7371ac6995de2456f4a46366c033c311ad 100644 (file)
--- a/tools/perf/tests/vmlinux-kallsyms.c
+++ b/tools/perf/tests/vmlinux-kallsyms.c
@@ -19,7 +19,6 @@ int test__vmlinux_matches_kallsyms(struct test *test __maybe_unused, int subtest
        struct symbol *sym;
        struct map *kallsyms_map, *vmlinux_map, *map;
        struct machine kallsyms, vmlinux;
-       enum map_type type = MAP__FUNCTION;
        struct maps *maps = machine__kernel_maps(&vmlinux);
        u64 mem_start, mem_end;
        bool header_printed;
@@ -205,7 +204,7 @@ next_pair:
                mem_start = vmlinux_map->unmap_ip(vmlinux_map, map->start);
                mem_end = vmlinux_map->unmap_ip(vmlinux_map, map->end);
 
-               pair = map_groups__find(&kallsyms.kmaps, type, mem_start);
+               pair = map_groups__find(&kallsyms.kmaps, mem_start);
                if (pair == NULL || pair->priv)
                        continue;
 

diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c
index 542bd5b79e48535d1533eb80e0a07c6ea2800886..a8739cd0d8caf8f6ef3df7fc3437c844c8402afc 100644 (file)
--- a/tools/perf/util/event.c
+++ b/tools/perf/util/event.c
@@ -1534,7 +1534,7 @@ struct map *__thread__find_map(struct thread *thread, u8 cpumode, enum map_type
                return NULL;
        }
 try_again:
-       al->map = map_groups__find(mg, type, al->addr);
+       al->map = __map_groups__find(mg, type, al->addr);
        if (al->map == NULL) {
                /*
                 * If this is outside of all known maps, and is a negative

diff --git a/tools/perf/util/map.c b/tools/perf/util/map.c
index f553e302bf9c6eea915898245353a5511d3faa37..91e2afb010f8a6cf3eabca6b5ade723526c21359 100644 (file)
--- a/tools/perf/util/map.c
+++ b/tools/perf/util/map.c
@@ -574,7 +574,7 @@ struct symbol *map_groups__find_symbol(struct map_groups *mg,
                                       enum map_type type, u64 addr,
                                       struct map **mapp)
 {
-       struct map *map = map_groups__find(mg, type, addr);
+       struct map *map = __map_groups__find(mg, type, addr);
 
        /* Ensure map is loaded before using map->map_ip */
        if (map != NULL && map__load(map) >= 0) {
@@ -627,8 +627,7 @@ int map_groups__find_ams(struct addr_map_symbol *ams)
        if (ams->addr < ams->map->start || ams->addr >= ams->map->end) {
                if (ams->map->groups == NULL)
                        return -1;
-               ams->map = map_groups__find(ams->map->groups, ams->map->type,
-                                           ams->addr);
+               ams->map = __map_groups__find(ams->map->groups, ams->map->type, ams->addr);
                if (ams->map == NULL)
                        return -1;
        }

diff --git a/tools/perf/util/map.h b/tools/perf/util/map.h
index 8ff75be0a96554f8f1dc0f2073dac69ecb8d503b..b4bcf569a1313d9c12b57203100490112a652add 100644 (file)
--- a/tools/perf/util/map.h
+++ b/tools/perf/util/map.h
@@ -214,12 +214,17 @@ static inline void map_groups__remove(struct map_groups *mg, struct map *map)
        maps__remove(&mg->maps[map->type], map);
 }
 
-static inline struct map *map_groups__find(struct map_groups *mg,
-                                          enum map_type type, u64 addr)
+static inline struct map *__map_groups__find(struct map_groups *mg,
+                                            enum map_type type, u64 addr)
 {
        return maps__find(&mg->maps[type], addr);
 }
 
+static inline struct map *map_groups__find(struct map_groups *mg, u64 addr)
+{
+       return __map_groups__find(mg, MAP__FUNCTION, addr);
+}
+
 static inline struct map *map_groups__first(struct map_groups *mg,
                                            enum map_type type)
 {

diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c
index 0bf4cf76f36a7488c611fc358559ca074e46d998..25701078beab992ff7c376e0dd8a2f40eeac9184 100644 (file)
--- a/tools/perf/util/symbol.c
+++ b/tools/perf/util/symbol.c
@@ -723,7 +723,7 @@ static int dso__split_kallsyms_for_kcore(struct dso *dso, struct map *map)
                if (module)
                        *module = '\0';
 
-               curr_map = map_groups__find(kmaps, map->type, pos->start);
+               curr_map = __map_groups__find(kmaps, map->type, pos->start);
 
                if (!curr_map) {
                        symbol__delete(pos);