X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2Fwin32%2FOSThreads.c;h=929b8171e7736e8fcd0d1deb163ac1ae5967f60b;hb=0ee0be109fd00ec629f7a2ad6a597885a0c9d5b4;hp=6f3629be4b5390df9c4fce92de5e17c6f792be04;hpb=e4fdc426413d178c86d3ba93702aad5eb17734bf;p=ghc-hetmet.git diff --git a/rts/win32/OSThreads.c b/rts/win32/OSThreads.c index 6f3629b..929b817 100644 --- a/rts/win32/OSThreads.c +++ b/rts/win32/OSThreads.c @@ -13,6 +13,7 @@ #if defined(THREADED_RTS) #include "OSThreads.h" #include "RtsUtils.h" +#include /* For reasons not yet clear, the entire contents of process.h is protected * by __STRICT_ANSI__ not being defined. @@ -197,6 +198,17 @@ setThreadLocalVar (ThreadLocalKey *key, void *value) } } +void +freeThreadLocalKey (ThreadLocalKey *key) +{ + BOOL r; + r = TlsFree(*key); + if (r == 0) { + DWORD dw = GetLastError(); + barf("freeThreadLocalKey failed: %lu", dw); + } +} + static unsigned __stdcall forkOS_createThreadWrapper ( void * entry ) @@ -220,6 +232,20 @@ forkOS_createThread ( HsStablePtr entry ) (unsigned*)&pId) == 0); } +nat +getNumberOfProcessors (void) +{ + static nat nproc = 0; + + if (nproc == 0) { + SYSTEM_INFO si; + GetSystemInfo(&si); + nproc = si.dwNumberOfProcessors; + } + + return nproc; +} + #else /* !defined(THREADED_RTS) */ int