diff options
| author | Kavon Farvardin <kavon@farvard.in> | 2018-09-23 15:29:37 -0500 |
|---|---|---|
| committer | Kavon Farvardin <kavon@farvard.in> | 2018-09-23 15:29:37 -0500 |
| commit | 84c2ad99582391005b5e873198b15e9e9eb4f78d (patch) | |
| tree | caa8c2f2ec7e97fbb4977263c6817c9af5025cf4 /rts/win32/OSThreads.c | |
| parent | 8ddb47cfcf5776e9a3c55fd37947c8a95e00fa12 (diff) | |
| parent | e68b439fe5de61b9a2ca51af472185c62ccb8b46 (diff) | |
| download | haskell-wip/T13904.tar.gz | |
update to current master againwip/T13904
Diffstat (limited to 'rts/win32/OSThreads.c')
| -rw-r--r-- | rts/win32/OSThreads.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/rts/win32/OSThreads.c b/rts/win32/OSThreads.c index ad4234066b..c67d621bc2 100644 --- a/rts/win32/OSThreads.c +++ b/rts/win32/OSThreads.c @@ -236,6 +236,7 @@ forkOS_createThreadWrapper ( void * entry ) cap = rts_lock(); rts_evalStableIO(&cap, (HsStablePtr) entry, NULL); rts_unlock(cap); + rts_done(); return 0; } @@ -577,9 +578,8 @@ void setThreadNode (uint32_t node) { if (osNumaAvailable()) { - StgWord mask = 0; - mask |= 1 << node; - if (!SetThreadAffinityMask(GetCurrentThread(), mask)) + uint64_t mask = 0; + if (!GetNumaNodeProcessorMask(node, &mask) && !SetThreadAffinityMask(GetCurrentThread(), mask)) { sysErrorBelch( "setThreadNode: Error setting affinity of thread to NUMA node `%u': %lu.", |