diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/gc/unix/gcenv.unix.cpp | 4 | ||||
-rw-r--r-- | src/pal/src/thread/thread.cpp | 3 | ||||
-rw-r--r-- | src/vm/gcenv.os.cpp | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/src/gc/unix/gcenv.unix.cpp b/src/gc/unix/gcenv.unix.cpp index 52dd673888..e7da607475 100644 --- a/src/gc/unix/gcenv.unix.cpp +++ b/src/gc/unix/gcenv.unix.cpp @@ -326,7 +326,7 @@ bool GCToOSInterface::Initialize() if (st == 0) { - for (size_t i = 0; i < g_totalCpuCount; i++) + for (size_t i = 0; i < CPU_SETSIZE; i++) { if (CPU_ISSET(i, &cpuSet)) { @@ -1152,7 +1152,7 @@ bool GCToOSInterface::GetProcessorForHeap(uint16_t heap_number, uint16_t* proc_n bool success = false; uint16_t availableProcNumber = 0; - for (size_t procNumber = 0; procNumber < g_totalCpuCount; procNumber++) + for (size_t procNumber = 0; procNumber < MAX_SUPPORTED_CPUS; procNumber++) { if (g_processAffinitySet.Contains(procNumber)) { diff --git a/src/pal/src/thread/thread.cpp b/src/pal/src/thread/thread.cpp index 42209a6028..1bc89944dd 100644 --- a/src/pal/src/thread/thread.cpp +++ b/src/pal/src/thread/thread.cpp @@ -3079,10 +3079,9 @@ PAL_GetCurrentThreadAffinitySet(SIZE_T size, UINT_PTR* data) if (st == 0) { const SIZE_T BitsPerBitsetEntry = 8 * sizeof(UINT_PTR); - int nrcpus = PAL_GetTotalCpuCount(); // Get info for as much processors as it is possible to fit into the resulting set - SIZE_T remainingCount = std::min(size * BitsPerBitsetEntry, (SIZE_T)nrcpus); + SIZE_T remainingCount = std::min(size * BitsPerBitsetEntry, (SIZE_T)CPU_SETSIZE); SIZE_T i = 0; while (remainingCount != 0) { diff --git a/src/vm/gcenv.os.cpp b/src/vm/gcenv.os.cpp index 5fb3745493..6cb006c9c5 100644 --- a/src/vm/gcenv.os.cpp +++ b/src/vm/gcenv.os.cpp @@ -1013,7 +1013,7 @@ bool GCToOSInterface::GetProcessorForHeap(uint16_t heap_number, uint16_t* proc_n // Locate heap_number-th available processor uint16_t procIndex; size_t cnt = heap_number; - for (uint16_t i = 0; i < GCToOSInterface::GetTotalProcessorCount(); i++) + for (uint16_t i = 0; i < MAX_SUPPORTED_CPUS; i++) { if (g_processAffinitySet.Contains(i)) { |