From: Lasse Collin <lasse.collin@tukaani.org>
Date: Thu, 20 Oct 2022 17:22:50 +0000 (+0300)
Subject: tuklib_cpucores: Use HW_NCPUONLINE on OpenBSD.
X-Git-Tag: v5.2.8~23
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5daa40454b63c4eb04ab5caeb339eddc95c94bb1;p=thirdparty%2Fxz.git

tuklib_cpucores: Use HW_NCPUONLINE on OpenBSD.

On OpenBSD the number of cores online is often less
than what HW_NCPU would return because OpenBSD disables
simultaneous multi-threading (SMT) by default.

Thanks to Christian Weisgerber.
---

diff --git a/m4/tuklib_cpucores.m4 b/m4/tuklib_cpucores.m4
index a2b09a72..c5cee23e 100644
--- a/m4/tuklib_cpucores.m4
+++ b/m4/tuklib_cpucores.m4
@@ -103,7 +103,12 @@ compile error
 int
 main(void)
 {
+#ifdef HW_NCPUONLINE
+	/* This is preferred on OpenBSD, see tuklib_cpucores.c. */
+	int name[2] = { CTL_HW, HW_NCPUONLINE };
+#else
 	int name[2] = { CTL_HW, HW_NCPU };
+#endif
 	int cpus;
 	size_t cpus_size = sizeof(cpus);
 	sysctl(name, 2, &cpus, &cpus_size, NULL, 0);
diff --git a/src/common/tuklib_cpucores.c b/src/common/tuklib_cpucores.c
index cc968dd2..bb3f2f75 100644
--- a/src/common/tuklib_cpucores.c
+++ b/src/common/tuklib_cpucores.c
@@ -72,7 +72,16 @@ tuklib_cpucores(void)
 	}
 
 #elif defined(TUKLIB_CPUCORES_SYSCTL)
+	// On OpenBSD HW_NCPUONLINE tells the number of processor cores that
+	// are online so it is preferred over HW_NCPU which also counts cores
+	// that aren't currently available. The number of cores online is
+	// often less than HW_NCPU because OpenBSD disables simultaneous
+	// multi-threading (SMT) by default.
+#	ifdef HW_NCPUONLINE
+	int name[2] = { CTL_HW, HW_NCPUONLINE };
+#	else
 	int name[2] = { CTL_HW, HW_NCPU };
+#	endif
 	int cpus;
 	size_t cpus_size = sizeof(cpus);
 	if (sysctl(name, 2, &cpus, &cpus_size, NULL, 0) != -1