blob: 4e501f4cf9d4e72576f9e1233b702ff9bbe02625 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
|
--- src/cpHastySpace.c.orig 2015-07-02 16:24:47 UTC
+++ src/cpHastySpace.c
@@ -5,8 +5,11 @@
#include <stdio.h>
#include <pthread.h>
-//#include <sys/param.h >
-#include <sys/sysctl.h>
+#ifdef _WIN32
+#include <windows.h>
+#else
+#include <unistd.h>
+#endif
#include "chipmunk/chipmunk_private.h"
#include "chipmunk/cpHastySpace.h"
@@ -314,14 +317,20 @@ cpHastySpaceSetThreads(cpSpace *space, u
cpHastySpace *hasty = (cpHastySpace *)space;
HaltThreads(hasty);
-#ifdef __APPLE__
if(threads == 0){
+#ifdef __APPLE__
size_t size = sizeof(threads);
sysctlbyname("hw.ncpu", &threads, &size, NULL, 0);
- }
+#elif defined(_SC_NPROCESSORS_ONLN)
+ threads = sysconf(_SC_NPROCESSORS_ONLN);
+#elif defined(_WIN32)
+ SYSTEM_INFO siSysInfo;
+ GetSystemInfo(&siSysInfo);
+ threads = siSysInfo.dwNumberOfProcessors;
#else
- if(threads == 0) threads = 1;
+ threads = 1;
#endif
+ }
hasty->num_threads = (threads < MAX_THREADS ? threads : MAX_THREADS);
hasty->num_working = hasty->num_threads - 1;
|
