hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tools lib bpf: Remove _get_ from non-refcount method names 

The use of this term is not warranted here, we use it in the kernel
sources and in tools/ for refcounting, so, for consistency, rename them.

Acked-bu: 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-4ya1ot2e2fkrz48ws9ebiofs@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Arnaldo Carvalho de Melo 2016-06-03 12:22:51 -03:00
parent 6e009e65a1
commit a7fe0450b0
3 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tools/lib/bpf/libbpf.c
View File

@ -1186,20 +1186,14 @@ bpf_object__next(struct bpf_object *prev)
return next;
}
const char *
bpf_object__get_name(struct bpf_object *obj)
const char *bpf_object__name(struct bpf_object *obj)
{
if (!obj)
return ERR_PTR(-EINVAL);
return obj->path;
return obj ? obj->path : ERR_PTR(-EINVAL);
}
unsigned int
bpf_object__get_kversion(struct bpf_object *obj)
unsigned int bpf_object__kversion(struct bpf_object *obj)
{
if (!obj)
return 0;
return obj->kern_version;
return obj ? obj->kern_version : 0;
}
struct bpf_program *
@ -1375,7 +1369,7 @@ bpf_map__next(struct bpf_map *prev, struct bpf_object *obj)
}
struct bpf_map *
bpf_object__get_map_by_name(struct bpf_object *obj, const char *name)
bpf_object__find_map_by_name(struct bpf_object *obj, const char *name)
{
struct bpf_map *pos;

6
tools/lib/bpf/libbpf.h
View File

@ -55,8 +55,8 @@ void bpf_object__close(struct bpf_object *object);
/* Load/unload object into/from kernel */
int bpf_object__load(struct bpf_object *obj);
int bpf_object__unload(struct bpf_object *obj);
const char *bpf_object__get_name(struct bpf_object *obj);
unsigned int bpf_object__get_kversion(struct bpf_object *obj);
const char *bpf_object__name(struct bpf_object *obj);
unsigned int bpf_object__kversion(struct bpf_object *obj);
struct bpf_object *bpf_object__next(struct bpf_object *prev);
#define bpf_object__for_each_safe(pos, tmp) \
@ -171,7 +171,7 @@ struct bpf_map_def {
*/
struct bpf_map;
struct bpf_map *
bpf_object__get_map_by_name(struct bpf_object *obj, const char *name);
bpf_object__find_map_by_name(struct bpf_object *obj, const char *name);
struct bpf_map *
bpf_map__next(struct bpf_map *map, struct bpf_object *obj);

4
tools/perf/util/bpf-loader.c
View File

@ -1137,7 +1137,7 @@ bpf__obj_config_map(struct bpf_object *obj,
goto out;
}
map = bpf_object__get_map_by_name(obj, map_name);
map = bpf_object__find_map_by_name(obj, map_name);
if (!map) {
pr_debug("ERROR: Map %s doesn't exist\n", map_name);
err = -BPF_LOADER_ERRNO__OBJCONF_MAP_NOTEXIST;
@ -1662,7 +1662,7 @@ int bpf__strerror_load(struct bpf_object *obj,
{
bpf__strerror_head(err, buf, size);
case LIBBPF_ERRNO__KVER: {
unsigned int obj_kver = bpf_object__get_kversion(obj);
unsigned int obj_kver = bpf_object__kversion(obj);
unsigned int real_kver;
if (fetch_kernel_version(&real_kver, NULL, 0)) {