diff options
author | Jan Vorlicek <janvorli@microsoft.com> | 2019-04-25 23:49:48 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-04-25 23:49:48 +0200 |
commit | 58a26dfea967eee422cffe487ffff4c1a2546da6 (patch) | |
tree | 367a606eee30ac98267d9862d53dd30cf7e03cb7 /src/gc | |
parent | 4449737e3e25d57f3fb1e4bb7aa8f16110a27538 (diff) | |
parent | 8d93bd9080f47efd87dc5420a6e600f8dc432659 (diff) | |
download | coreclr-58a26dfea967eee422cffe487ffff4c1a2546da6.tar.gz coreclr-58a26dfea967eee422cffe487ffff4c1a2546da6.tar.bz2 coreclr-58a26dfea967eee422cffe487ffff4c1a2546da6.zip |
Merge pull request #24242 from janvorli/fix-numa-node-for-disabled-numa
Fix NUMA node for heap when NUMA is not available
Diffstat (limited to 'src/gc')
-rw-r--r-- | src/gc/windows/gcenv.windows.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/gc/windows/gcenv.windows.cpp b/src/gc/windows/gcenv.windows.cpp index 5f6a0ff291..e5c4d7a8db 100644 --- a/src/gc/windows/gcenv.windows.cpp +++ b/src/gc/windows/gcenv.windows.cpp @@ -1332,20 +1332,20 @@ bool GCToOSInterface::GetProcessorForHeap(uint16_t heap_number, uint16_t* proc_n GroupProcNo groupProcNo(gn, gpn); *proc_no = groupProcNo.GetCombinedValue(); - if (GCToOSInterface::CanEnableGCNumaAware()) - { - PROCESSOR_NUMBER procNumber; + PROCESSOR_NUMBER procNumber; - if (CanEnableGCCPUGroups()) - { - procNumber.Group = gn; - } - else - { - // Get the current processor group - GetCurrentProcessorNumberEx(&procNumber); - } + if (CanEnableGCCPUGroups()) + { + procNumber.Group = gn; + } + else + { + // Get the current processor group + GetCurrentProcessorNumberEx(&procNumber); + } + if (GCToOSInterface::CanEnableGCNumaAware()) + { procNumber.Number = (BYTE)gpn; procNumber.Reserved = 0; @@ -1356,7 +1356,7 @@ bool GCToOSInterface::GetProcessorForHeap(uint16_t heap_number, uint16_t* proc_n } else { // no numa setting, each cpu group is treated as a node - *node_no = groupProcNo.GetGroup(); + *node_no = procNumber.Group; } } |