diff options
| -rw-r--r-- | src/gc/windows/gcenv.windows.cpp | 26 | ||||
| -rw-r--r-- | src/vm/gcenv.os.cpp | 26 |
2 files changed, 26 insertions, 26 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; } } diff --git a/src/vm/gcenv.os.cpp b/src/vm/gcenv.os.cpp index 6e3f775660..884a81b279 100644 --- a/src/vm/gcenv.os.cpp +++ b/src/vm/gcenv.os.cpp @@ -982,20 +982,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 (CPUGroupInfo::CanEnableGCCPUGroups()) - { - procNumber.Group = gn; - } - else - { - // Get the current processor group - GetCurrentProcessorNumberEx(&procNumber); - } + if (CPUGroupInfo::CanEnableGCCPUGroups()) + { + procNumber.Group = gn; + } + else + { + // Get the current processor group + GetCurrentProcessorNumberEx(&procNumber); + } + if (GCToOSInterface::CanEnableGCNumaAware()) + { procNumber.Number = (BYTE)gpn; procNumber.Reserved = 0; @@ -1006,7 +1006,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; } #else // !FEATURE_PAL *proc_no = procIndex; |