From d2dc7bcd0d94ef54e336119a2a79113b87839820 Mon Sep 17 00:00:00 2001 From: Andrii Nakryiko Date: Fri, 17 Dec 2021 14:32:30 -0800 Subject: [PATCH] libbpf-tools: update syscount for libbpf 1.0 Switch to libbpf 1.0 mode and adapt libbpf API usage accordingly. Signed-off-by: Andrii Nakryiko --- libbpf-tools/syscount.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/libbpf-tools/syscount.c b/libbpf-tools/syscount.c index 262b986e..b677a01d 100644 --- a/libbpf-tools/syscount.c +++ b/libbpf-tools/syscount.c @@ -391,14 +391,9 @@ int main(int argc, char **argv) goto free_names; } + libbpf_set_strict_mode(LIBBPF_STRICT_ALL); libbpf_set_print(libbpf_print_fn); - err = bump_memlock_rlimit(); - if (err) { - warn("failed to increase rlimit: %s\n", strerror(errno)); - goto free_names; - } - obj = syscount_bpf__open(); if (!obj) { warn("failed to open BPF object\n"); @@ -424,16 +419,15 @@ int main(int argc, char **argv) } obj->links.sys_exit = bpf_program__attach(obj->progs.sys_exit); - err = libbpf_get_error(obj->links.sys_exit); - if (err) { - warn("failed to attach sys_exit program: %s\n", - strerror(-err)); + if (!obj->links.sys_exit) { + err = -errno; + warn("failed to attach sys_exit program: %s\n", strerror(-err)); goto cleanup_obj; } if (env.latency) { obj->links.sys_enter = bpf_program__attach(obj->progs.sys_enter); - err = libbpf_get_error(obj->links.sys_enter); - if (err) { + if (!obj->links.sys_enter) { + err = -errno; warn("failed to attach sys_enter programs: %s\n", strerror(-err)); goto cleanup_obj; -- 2.34.1