perf symbols: Remove map_type arg from dso__find_symbol()

One more step to ditch MAP__{VARIABLE,FUNCTION}

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

diff --git a/tools/perf/util/db-export.c b/tools/perf/util/db-export.c
index b0c2b5c5d3375fc919f24f92a9e4b7eba11c084d..04fb1a99c7371c11d738c0c164d074e277049201 100644 (file)
--- a/tools/perf/util/db-export.c
+++ b/tools/perf/util/db-export.c
@@ -315,8 +315,7 @@ static struct call_path *call_path_from_sample(struct db_export *dbe,
                al.addr = node->ip;
 
                if (al.map && !al.sym)
-                       al.sym = dso__find_symbol(al.map->dso, MAP__FUNCTION,
-                                                 al.addr);
+                       al.sym = dso__find_symbol(al.map->dso, al.addr);
 
                db_ids_from_al(dbe, &al, &dso_db_id, &sym_db_id, &offset);
 

diff --git a/tools/perf/util/map.c b/tools/perf/util/map.c
index 91e2afb010f8a6cf3eabca6b5ade723526c21359..ab12f2bc7669e3597b25e4e656df9f186363b970 100644 (file)
--- a/tools/perf/util/map.c
+++ b/tools/perf/util/map.c
@@ -353,7 +353,7 @@ struct symbol *map__find_symbol(struct map *map, u64 addr)
        if (map__load(map) < 0)
                return NULL;
 
-       return dso__find_symbol(map->dso, map->type, addr);
+       return __dso__find_symbol(map->dso, map->type, addr);
 }
 
 struct symbol *map__find_symbol_by_name(struct map *map, const char *name)
@@ -364,7 +364,7 @@ struct symbol *map__find_symbol_by_name(struct map *map, const char *name)
        if (!dso__sorted_by_name(map->dso, map->type))
                dso__sort_by_name(map->dso, map->type);
 
-       return dso__find_symbol_by_name(map->dso, map->type, name);
+       return __dso__find_symbol_by_name(map->dso, map->type, name);
 }
 
 struct map *map__clone(struct map *from)

diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c
index 5d77c60e63bf1a518ee9c00910a0db5bff0970ff..2b81ccc94a7ef7426c393ced5c20d5b0e3f9e65b 100644 (file)
--- a/tools/perf/util/symbol.c
+++ b/tools/perf/util/symbol.c
@@ -504,8 +504,8 @@ void dso__insert_symbol(struct dso *dso, enum map_type type, struct symbol *sym)
        }
 }
 
-struct symbol *dso__find_symbol(struct dso *dso,
-                               enum map_type type, u64 addr)
+struct symbol *__dso__find_symbol(struct dso *dso,
+                                 enum map_type type, u64 addr)
 {
        if (dso->last_find_result[type].addr != addr || dso->last_find_result[type].symbol == NULL) {
                dso->last_find_result[type].addr   = addr;
@@ -549,10 +549,10 @@ struct symbol *symbol__next_by_name(struct symbol *sym)
 }
 
  /*
-  * Teturns first symbol that matched with @name.
+  * Returns first symbol that matched with @name.
   */
-struct symbol *dso__find_symbol_by_name(struct dso *dso, enum map_type type,
-                                       const char *name)
+struct symbol *__dso__find_symbol_by_name(struct dso *dso, enum map_type type,
+                                         const char *name)
 {
        struct symbol *s = symbols__find_by_name(&dso->symbol_names[type], name,
                                                 SYMBOL_TAG_INCLUDE__NONE);

diff --git a/tools/perf/util/symbol.h b/tools/perf/util/symbol.h
index 924f465307b1fe0161fb8ddaeea8d680ebaceb72..2b985ff2e72576dbedd780536ef25133bd642969 100644 (file)
--- a/tools/perf/util/symbol.h
+++ b/tools/perf/util/symbol.h
@@ -262,10 +262,14 @@ int dso__load_kallsyms(struct dso *dso, const char *filename, struct map *map);
 void dso__insert_symbol(struct dso *dso, enum map_type type,
                        struct symbol *sym);
 
-struct symbol *dso__find_symbol(struct dso *dso, enum map_type type,
-                               u64 addr);
-struct symbol *dso__find_symbol_by_name(struct dso *dso, enum map_type type,
-                                       const char *name);
+struct symbol *__dso__find_symbol(struct dso *dso, enum map_type type, u64 addr);
+struct symbol *__dso__find_symbol_by_name(struct dso *dso, enum map_type type, const char *name);
+
+static inline struct symbol *dso__find_symbol(struct dso *dso, u64 addr)
+{
+       return __dso__find_symbol(dso, MAP__FUNCTION, addr);
+}
+
 struct symbol *symbol__next_by_name(struct symbol *sym);
 
 struct symbol *dso__first_symbol(struct dso *dso);