From: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Date: Tue, 15 Mar 2016 20:13:24 +0000 (-0400)
Subject: Tests: Introduce conf_proc_count()
X-Git-Tag: v2.6.2~5
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=096b5145a53ae99d17f3b05b335d68696c32dd87;p=lttng-tools.git

Tests: Introduce conf_proc_count()

Tests are using the nproc utility which return the number of
_available_ CPUs. The distinction between online, available and
configured CPUs is subtle, but important.

The number of "online" CPUs can change at runtime as CPUs are
hot-plugged. This could happen during a test and result in
unexpected results.

The number of "configured" CPUs includes any CPU which may be
offline at the time.

The number of "available" CPUs, which is what is returned by the
nproc utility, may differ from both "online" and "configured"
counts. This is the case in containers which are assigned to a
subset of configured CPUs.

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---

diff --git a/tests/utils/utils.sh b/tests/utils/utils.sh
index 9e78dc234..1f116a6d6 100644
--- a/tests/utils/utils.sh
+++ b/tests/utils/utils.sh
@@ -92,6 +92,16 @@ function randstring()
 	echo
 }
 
+# Return the number of _configured_ CPUs.
+function conf_proc_count()
+{
+	getconf _NPROCESSORS_CONF
+	if [ $? -ne 0 ]; then
+		diag "Failed to get the number of configured CPUs"
+	fi
+	echo
+}
+
 function lttng_enable_kernel_event
 {
 	local sess_name=$1