tools lib bpf: Rename bpf_map__get_name() to bpf_map__name()

For consistency, leaving "get" for reference counting.

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

diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c
index 9bba1a907abee7c7f78f86b1a9c46095bfcee83d..4dc617befd13b58a390a255ce9175ea32d9e3a5c 100644 (file)
--- a/tools/lib/bpf/libbpf.c
+++ b/tools/lib/bpf/libbpf.c
@@ -1328,11 +1328,9 @@ int bpf_map__get_def(struct bpf_map *map, struct bpf_map_def *pdef)
        return 0;
 }
 
-const char *bpf_map__get_name(struct bpf_map *map)
+const char *bpf_map__name(struct bpf_map *map)
 {
-       if (!map)
-               return NULL;
-       return map->name;
+       return map ? map->name : NULL;
 }
 
 int bpf_map__set_private(struct bpf_map *map, void *priv,

diff --git a/tools/lib/bpf/libbpf.h b/tools/lib/bpf/libbpf.h
index 916abf971249b6b2dd78cdf88262cc0357566595..f8fbba4ccef3033c680b66bc79f249bb9711ea20 100644 (file)
--- a/tools/lib/bpf/libbpf.h
+++ b/tools/lib/bpf/libbpf.h
@@ -182,7 +182,7 @@ bpf_map__next(struct bpf_map *map, struct bpf_object *obj);
 
 int bpf_map__get_fd(struct bpf_map *map);
 int bpf_map__get_def(struct bpf_map *map, struct bpf_map_def *pdef);
-const char *bpf_map__get_name(struct bpf_map *map);
+const char *bpf_map__name(struct bpf_map *map);
 
 typedef void (*bpf_map_clear_priv_t)(struct bpf_map *, void *);
 int bpf_map__set_private(struct bpf_map *map, void *priv,

diff --git a/tools/perf/util/bpf-loader.c b/tools/perf/util/bpf-loader.c
index e9a034e86b91ad18b0a00bb6da178cbfcfe19f7a..c819eb8ba14581b24e96defdb6ed756b35117e06 100644 (file)
--- a/tools/perf/util/bpf-loader.c
+++ b/tools/perf/util/bpf-loader.c
@@ -897,10 +897,9 @@ bpf_map_priv__clone(struct bpf_map_priv *priv)
 static int
 bpf_map__add_op(struct bpf_map *map, struct bpf_map_op *op)
 {
+       const char *map_name = bpf_map__name(map);
        struct bpf_map_priv *priv = bpf_map__priv(map);
-       const char *map_name;
 
-       map_name = bpf_map__get_name(map);
        if (IS_ERR(priv)) {
                pr_debug("Failed to get private from map %s\n", map_name);
                return PTR_ERR(priv);
@@ -948,11 +947,9 @@ __bpf_map__config_value(struct bpf_map *map,
 {
        struct bpf_map_def def;
        struct bpf_map_op *op;
-       const char *map_name;
+       const char *map_name = bpf_map__name(map);
        int err;
 
-       map_name = bpf_map__get_name(map);
-
        err = bpf_map__get_def(map, &def);
        if (err) {
                pr_debug("Unable to get map definition from '%s'\n",
@@ -1014,10 +1011,9 @@ __bpf_map__config_event(struct bpf_map *map,
        struct perf_evsel *evsel;
        struct bpf_map_def def;
        struct bpf_map_op *op;
-       const char *map_name;
+       const char *map_name = bpf_map__name(map);
        int err;
 
-       map_name = bpf_map__get_name(map);
        evsel = perf_evlist__find_evsel_by_str(evlist, term->val.str);
        if (!evsel) {
                pr_debug("Event (for '%s') '%s' doesn't exist\n",
@@ -1259,13 +1255,11 @@ bpf_map_config_foreach_key(struct bpf_map *map,
                           void *arg)
 {
        int err, map_fd;
-       const char *name;
        struct bpf_map_op *op;
        struct bpf_map_def def;
+       const char *name = bpf_map__name(map);
        struct bpf_map_priv *priv = bpf_map__priv(map);
 
-       name = bpf_map__get_name(map);
-
        if (IS_ERR(priv)) {
                pr_debug("ERROR: failed to get private from map %s\n", name);
                return -BPF_LOADER_ERRNO__INTERNAL;
@@ -1472,9 +1466,9 @@ int bpf__apply_obj_config(void)
 
 #define bpf__for_each_stdout_map(pos, obj, objtmp)     \
        bpf__for_each_map(pos, obj, objtmp)             \
-               if (bpf_map__get_name(pos) &&           \
+               if (bpf_map__name(pos) &&               \
                        (strcmp("__bpf_stdout__",       \
-                               bpf_map__get_name(pos)) == 0))
+                               bpf_map__name(pos)) == 0))
 
 int bpf__setup_stdout(struct perf_evlist *evlist __maybe_unused)
 {