From: Andrii Nakryiko <andrii@kernel.org>
Date: Fri, 17 Dec 2021 22:32:29 +0000 (-0800)
Subject: libbpf-tools: update numamove for libbpf 1.0
X-Git-Tag: v0.24.0~33^2~15
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=824ffd2a1fbb527f5fd25e2caa4b43fbf1ee858b;p=platform%2Fupstream%2Fbcc.git

libbpf-tools: update numamove for libbpf 1.0

Switch to libbpf 1.0 mode and adapt libbpf API usage accordingly.

Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
---

diff --git a/libbpf-tools/numamove.c b/libbpf-tools/numamove.c
index 01ad6765..ba7454e8 100644
--- a/libbpf-tools/numamove.c
+++ b/libbpf-tools/numamove.c
@@ -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: