mirror/libbpf
1
0
Fork 0
mirror of https://github.com/netdata/libbpf.git synced 2026-03-29 12:49:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

libbpf: Rename btf__get_from_id() as btf__load_from_kernel_by_id()

Browse Source 
Rename function btf__get_from_id() as btf__load_from_kernel_by_id() to
better indicate what the function does. Change the new function so that,
instead of requiring a pointer to the pointer to update and returning
with an error code, it takes a single argument (the id of the BTF
object) and returns the corresponding pointer. This is more in line with
the existing constructors.

The other tools calling the (soon-to-be) deprecated btf__get_from_id()
function will be updated in a future commit.

References:

- https://github.com/libbpf/libbpf/issues/278
- https://github.com/libbpf/libbpf/wiki/Libbpf:-the-road-to-v1.0#btfh-apis

Signed-off-by: Quentin Monnet <quentin@isovalent.com>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Acked-by: John Fastabend <john.fastabend@gmail.com>
Link: https://lore.kernel.org/bpf/20210729162028.29512-4-quentin@isovalent.com
This commit is contained in:
Quentin Monnet
2021-07-29 17:20:23 +01:00
committed by Andrii Nakryiko
parent a180eb551e
commit 73788dd22f
4 changed files with 24 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/btf.c
View File

@@ -1383,21 +1383,30 @@ exit_free:
return btf;
}
struct btf *btf__load_from_kernel_by_id(__u32 id)
{
struct btf *btf;
int btf_fd;
btf_fd = bpf_btf_get_fd_by_id(id);
if (btf_fd < 0)
return libbpf_err_ptr(-errno);
btf = btf_get_from_fd(btf_fd, NULL);
close(btf_fd);
return libbpf_ptr(btf);
}
int btf__get_from_id(__u32 id, struct btf **btf)
{
struct btf *res;
int err, btf_fd;
int err;
*btf = NULL;
btf_fd = bpf_btf_get_fd_by_id(id);
if (btf_fd < 0)
return libbpf_err(-errno);
res = btf_get_from_fd(btf_fd, NULL);
res = btf__load_from_kernel_by_id(id);
err = libbpf_get_error(res);
close(btf_fd);
if (err)
return libbpf_err(err);