libbpf-tools: update syscount for libbpf 1.0
authorAndrii Nakryiko <andrii@kernel.org>
Fri, 17 Dec 2021 22:32:30 +0000 (14:32 -0800)
committerAndrii Nakryiko <andrii@kernel.org>
Mon, 20 Dec 2021 21:21:26 +0000 (13:21 -0800)
Switch to libbpf 1.0 mode and adapt libbpf API usage accordingly.

Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
libbpf-tools/syscount.c

index 262b986ea49699593bab1e07c3dc6eeb1e6dacf8..b677a01dea8b64102821ba82d8ef9cff1808fe14 100644 (file)
@@ -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;