From aa56331b81e9f1199e29af0fbb6df041659b58ba Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Thu, 9 May 2024 15:09:17 -0400 Subject: [PATCH 1/2] ust-fd: Add close_range declaration Old libc headers do not contain a declaration of close_range(). Emit our own declaration to prevent compiler warnings. Signed-off-by: Mathieu Desnoyers Change-Id: If6ca8193895efbb6ce1ba46e092939b8099bcff6 --- src/lib/lttng-ust-fd/lttng-ust-fd.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/lib/lttng-ust-fd/lttng-ust-fd.c b/src/lib/lttng-ust-fd/lttng-ust-fd.c index 0360b6f2..01decd1e 100644 --- a/src/lib/lttng-ust-fd/lttng-ust-fd.c +++ b/src/lib/lttng-ust-fd/lttng-ust-fd.c @@ -148,6 +148,9 @@ int fclose(FILE *stream) __lttng_ust_fd_plibc_fclose); } +/* Old libc headers don't contain a close_range() declaration. */ +int close_range(unsigned int first, unsigned int last, int flags); + /* * Override the libc close_range() symbol with our own, allowing * applications to close arbitrary file descriptors. If the fd is owned -- 2.34.1 From 9b9714603cfa96a63a42dc9cb8266f81df42a4f3 Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Tue, 11 Jun 2024 16:56:07 -0400 Subject: [PATCH 2/2] Fix: test_benchmark: do not match "CPU(s) scaling MHz:" Do not match "CPU(s) scaling MHz:" line, it breaks the script. Signed-off-by: Mathieu Desnoyers Change-Id: Ifa392d018590e098dae75acef2b8265c8714c4cb --- tests/benchmark/test_benchmark | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/benchmark/test_benchmark b/tests/benchmark/test_benchmark index 33e5ed49..16d4a855 100755 --- a/tests/benchmark/test_benchmark +++ b/tests/benchmark/test_benchmark @@ -13,7 +13,7 @@ plan_tests 1 : ${ITERS:=10} : ${DURATION:=2} : ${NR_THREADS:=1} -: ${NR_CPUS:=$(lscpu | grep "^CPU(s)" | sed 's/^.*:[ \t]*//g')} +: ${NR_CPUS:=$(lscpu | grep "^CPU(s):" | sed 's/^.*:[ \t]*//g')} : ${TIME:="./$CURDIR/ptime"} -- 2.34.1