libbpf-tools: update numamove for libbpf 1.0
authorAndrii Nakryiko <andrii@kernel.org>
Fri, 17 Dec 2021 22:32:29 +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/numamove.c

index 01ad6765a1cf7a688999187ae6bbea609de302d9..ba7454e86d352926eb0c6ac3022f68f548ad421f 100644 (file)
@@ -81,14 +81,9 @@ int main(int argc, char **argv)
        if (err)
                return err;
 
+       libbpf_set_strict_mode(LIBBPF_STRICT_ALL);
        libbpf_set_print(libbpf_print_fn);
 
-       err = bump_memlock_rlimit();
-       if (err) {
-               fprintf(stderr, "failed to increase rlimit: %d\n", err);
-               return 1;
-       }
-
        obj = numamove_bpf__open_and_load();
        if (!obj) {
                fprintf(stderr, "failed to open and/or load BPF object\n");
@@ -108,18 +103,15 @@ int main(int argc, char **argv)
 
        signal(SIGINT, sig_handler);
 
-       printf("%-10s %18s %18s\n", "TIME", "NUMA_migrations",
-               "NUMA_migrations_ms");
+       printf("%-10s %18s %18s\n", "TIME", "NUMA_migrations", "NUMA_migrations_ms");
        while (!exiting) {
                sleep(1);
                time(&t);
                tm = localtime(&t);
                strftime(ts, sizeof(ts), "%H:%M:%S", tm);
                printf("%-10s %18lld %18lld\n", ts,
-                       __atomic_exchange_n(&obj->bss->num, 0,
-                                       __ATOMIC_RELAXED),
-                       __atomic_exchange_n(&obj->bss->latency, 0,
-                                       __ATOMIC_RELAXED));
+                       __atomic_exchange_n(&obj->bss->num, 0, __ATOMIC_RELAXED),
+                       __atomic_exchange_n(&obj->bss->latency, 0, __ATOMIC_RELAXED));
        }
 
 cleanup: