root
/
xz
mirror of https://git.tukaani.org/xz.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Windows: Add Windows support to tuklib_cpucores(). 

It is used for Cygwin too. I'm not sure if that is
a good or bad idea.

Thanks to Vincent Torri.
This commit is contained in:
Lasse Collin 2013-08-03 13:52:58 +03:00
parent eada8a875c
commit 124eb69c78
2 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
m4/tuklib_cpucores.m4
View File

@ -9,8 +9,10 @@
# This information is used by tuklib_cpucores.c. # This information is used by tuklib_cpucores.c.
# #
# Supported methods: # Supported methods:
# - GetSystemInfo(): Windows (including Cygwin)
# - sysctl(): BSDs, OS/2 # - sysctl(): BSDs, OS/2
# - sysconf(): GNU/Linux, Solaris, Tru64, IRIX, AIX, Cygwin # - sysconf(): GNU/Linux, Solaris, Tru64, IRIX, AIX, Cygwin (but
# GetSystemInfo() is used on Cygwin)
# - pstat_getdynamic(): HP-UX # - pstat_getdynamic(): HP-UX
# #
# COPYING # COPYING
@ -30,6 +32,19 @@ AC_CHECK_HEADERS([sys/param.h])
AC_CACHE_CHECK([how to detect the number of available CPU cores], AC_CACHE_CHECK([how to detect the number of available CPU cores],
[tuklib_cv_cpucores_method], [ [tuklib_cv_cpucores_method], [
# Maybe checking $host_os would be enough but this matches what
# tuklib_cpucores.c does.
#
# NOTE: IRIX has a compiler that doesn't error out with #error, so use
# a non-compilable text instead of #error to generate an error.
AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
#if defined(_WIN32) || defined(__CYGWIN__)
int main(void) { return 0; }
#else
compile error
#endif
]])], [tuklib_cv_cpucores_method=special], [
# Look for sysctl() solution first, because on OS/2, both sysconf() # Look for sysctl() solution first, because on OS/2, both sysconf()
# and sysctl() pass the tests in this file, but only sysctl() # and sysctl() pass the tests in this file, but only sysctl()
# actually works. # actually works.
@ -82,7 +97,7 @@ main(void)
]])], [tuklib_cv_cpucores_method=pstat_getdynamic], [ ]])], [tuklib_cv_cpucores_method=pstat_getdynamic], [
tuklib_cv_cpucores_method=unknown tuklib_cv_cpucores_method=unknown
])])])]) ])])])])])
case $tuklib_cv_cpucores_method in case $tuklib_cv_cpucores_method in
sysctl) sysctl)

13
src/common/tuklib_cpucores.c
View File

@ -12,6 +12,12 @@
#include "tuklib_cpucores.h" #include "tuklib_cpucores.h"
#if defined(_WIN32) || defined(__CYGWIN__)
# ifndef _WIN32_WINNT
# define _WIN32_WINNT 0x0500
# endif
# include <windows.h>
#if defined(TUKLIB_CPUCORES_SYSCTL) #if defined(TUKLIB_CPUCORES_SYSCTL)
# ifdef HAVE_SYS_PARAM_H # ifdef HAVE_SYS_PARAM_H
# include <sys/param.h> # include <sys/param.h>
@ -33,7 +39,12 @@ tuklib_cpucores(void)
{ {
uint32_t ret = 0; uint32_t ret = 0;
#if defined(TUKLIB_CPUCORES_SYSCTL) #if defined(_WIN32) || defined(__CYGWIN__)
SYSTEM_INFO sysinfo;
GetSystemInfo(&sysinfo);
ret = sysinfo.dwNumberOfProcessors;
#elif defined(TUKLIB_CPUCORES_SYSCTL)
int name[2] = { CTL_HW, HW_NCPU }; int name[2] = { CTL_HW, HW_NCPU };
int cpus; int cpus;
size_t cpus_size = sizeof(cpus); size_t cpus_size = sizeof(cpus);