tests: Windows processor count support

Some tests need to get the number of processors. Use GetSystemInfo() for
this and ensure that sysctl.h is only included on systems that have it.

Author: adierking

tests/dispatch_apply.c

@@ -22,18 +22,18 @@
 #include <stdio.h>
 #if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__))
 #include <unistd.h>
+#ifdef __ANDROID__
+#include <linux/sysctl.h>
+#else
+#include <sys/sysctl.h>
+#endif /* __ANDROID__ */
 #endif
 #include <stdlib.h>
 #include <assert.h>
 #ifdef __APPLE__
 #include <libkern/OSAtomic.h>
 #endif
 #include <sys/types.h>
-#ifdef __ANDROID__
-#include <linux/sysctl.h>
-#else
-#include <sys/sysctl.h>
-#endif /* __ANDROID__ */
 
 #include <bsdtests.h>
 #include "dispatch_test.h"
@@ -80,6 +80,10 @@ static void test_apply_contended(dispatch_queue_t dq)
 	uint32_t activecpu;
 #ifdef __linux__
 	activecpu = (uint32_t)sysconf(_SC_NPROCESSORS_ONLN);
+#elif defined(_WIN32)
+	SYSTEM_INFO si;
+	GetSystemInfo(&si);
+	activecpu = si.dwNumberOfProcessors;
 #else
 	size_t s = sizeof(activecpu);
 	sysctlbyname("hw.activecpu", &activecpu, &s, NULL, 0);

tests/dispatch_concur.c

@@ -20,17 +20,17 @@
 
 #include <dispatch/dispatch.h>
 #include <dispatch/private.h>
-#if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__))
-#include <unistd.h>
-#endif
 #include <stdlib.h>
 #include <stdio.h>
+#if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__))
 #include <sys/types.h>
+#include <unistd.h>
 #ifdef __ANDROID__
 #include <linux/sysctl.h>
 #else
 #include <sys/sysctl.h>
 #endif /* __ANDROID__ */
+#endif
 
 #include <bsdtests.h>
 #include "dispatch_test.h"
@@ -234,6 +234,10 @@ main(int argc __attribute__((unused)), char* argv[] __attribute__((unused)))
 
 #ifdef __linux__
 	activecpu = (uint32_t)sysconf(_SC_NPROCESSORS_ONLN);
+#elif defined(_WIN32)
+	SYSTEM_INFO si;
+	GetSystemInfo(&si);
+	activecpu = si.dwNumberOfProcessors;
 #else
 	size_t s = sizeof(activecpu);
 	sysctlbyname("hw.activecpu", &activecpu, &s, NULL, 0);

tests/dispatch_priority.c

@@ -23,18 +23,18 @@
 #include <dispatch/private.h>
 #if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__))
 #include <unistd.h>
+#ifdef __ANDROID__
+#include <linux/sysctl.h>
+#else
+#include <sys/sysctl.h>
+#endif /* __ANDROID__ */
 #endif
 #include <stdlib.h>
 #include <assert.h>
 #ifdef __APPLE__
 #include <TargetConditionals.h>
 #endif
 #include <sys/types.h>
-#ifdef __ANDROID__
-#include <linux/sysctl.h>
-#else
-#include <sys/sysctl.h>
-#endif /* __ANDROID__ */
 
 #include <bsdtests.h>
 #include "dispatch_test.h"
@@ -85,6 +85,10 @@ n_blocks(void)
 	dispatch_once(&pred, ^{
 #ifdef __linux__
 		n = (int)sysconf(_SC_NPROCESSORS_CONF);
+#elif defined(_WIN32)
+		SYSTEM_INFO si;
+		GetSystemInfo(&si);
+		n = (int)si.dwNumberOfProcessors;
 #else
 		size_t l = sizeof(n);
 		int rc = sysctlbyname("hw.ncpu", &n, &l, NULL, 0);

tests/dispatch_readsync.c

@@ -23,12 +23,12 @@
 #include <stdlib.h>
 #if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__))
 #include <unistd.h>
-#endif
 #ifdef __ANDROID__
 #include <linux/sysctl.h>
 #else
 #include <sys/sysctl.h>
 #endif /* __ANDROID__ */
+#endif
 #include <assert.h>
 
 #include <bsdtests.h>
@@ -143,6 +143,11 @@ main(void)
 	activecpu = (uint32_t)sysconf(_SC_NPROCESSORS_ONLN);
 	// don't want to parse /proc/sys/kernel/threads-max
 	wq_max_threads = activecpu * NTHREADS + 2;
+#elif defined(_WIN32)
+	SYSTEM_INFO si;
+	GetSystemInfo(&si);
+	activecpu = si.dwNumberOfProcessors;
+	wq_max_threads = activecpu * NTHREADS + 2;
 #else
 	size_t s = sizeof(uint32_t);
 	sysctlbyname("hw.activecpu", &activecpu, &s, NULL, 0);