Changeset 81114 in vbox for trunk/src/VBox

Timestamp:

Oct 4, 2019 10:01:35 PM (5 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

133739

Message:

IPRT/mp-win.cpp: A couple of fixes wrt lots of processors and groups. bugref:9501

File:

• trunk/src/VBox/Runtime/r3/win/mp-win.cpp (modified) (4 diffs)

trunk/src/VBox/Runtime/r3/win/mp-win.cpp ¶

@@ -419 +419 @@
 
         unsigned const cbGip = pGip->cPages * PAGE_SIZE;
-        for (uint32_t idxGroup = 0; idxGroup < g_cRtMpWinMaxCpus; idxGroup++)
+        for (uint32_t idxGroup = 0; idxGroup < g_cRtMpWinMaxCpuGroups; idxGroup++)
         {
             uint32_t idxMember;
@@ -427 +427 @@
                 PSUPGIPCPUGROUP pGipCpuGrp  = (PSUPGIPCPUGROUP)((uintptr_t)pGip + offCpuGroup);
                 uint32_t        cMaxMembers = pGipCpuGrp->cMaxMembers;
-                AssertStmt(cMaxMembers < RT_ELEMENTS(g_aRtMpWinCpuGroups[0].aidxCpuSetMembers),
-                           cMaxMembers = RT_ELEMENTS(g_aRtMpWinCpuGroups[0].aidxCpuSetMembers));
+                AssertStmt(cMaxMembers <= RT_ELEMENTS(g_aRtMpWinCpuGroups[0].aidxCpuSetMembers),
+                           cMaxMembers  = RT_ELEMENTS(g_aRtMpWinCpuGroups[0].aidxCpuSetMembers));
                 g_aRtMpWinCpuGroups[idxGroup].cMaxCpus     = cMaxMembers;
                 g_aRtMpWinCpuGroups[idxGroup].cActiveCpus  = RT_MIN(pGipCpuGrp->cMembers, cMaxMembers);
@@ -478 +478 @@
             ASMCompilerBarrier();
 
-            for (uint32_t idxGroup = 0; idxGroup < g_cRtMpWinMaxCpus; idxGroup++)
+            for (uint32_t idxGroup = 0; idxGroup < g_cRtMpWinMaxCpuGroups; idxGroup++)
             {
                 uint32_t offCpuGroup = pGip->aoffCpuGroup[idxGroup];
@@ -485 +485 @@
                     PSUPGIPCPUGROUP pGipCpuGrp  = (PSUPGIPCPUGROUP)((uintptr_t)pGip + offCpuGroup);
                     uint32_t        cMaxMembers = pGipCpuGrp->cMaxMembers;
-                    AssertStmt(cMaxMembers < RT_ELEMENTS(g_aRtMpWinCpuGroups[0].aidxCpuSetMembers),
-                               cMaxMembers = RT_ELEMENTS(g_aRtMpWinCpuGroups[0].aidxCpuSetMembers));
+                    AssertStmt(cMaxMembers <= RT_ELEMENTS(g_aRtMpWinCpuGroups[0].aidxCpuSetMembers),
+                               cMaxMembers  = RT_ELEMENTS(g_aRtMpWinCpuGroups[0].aidxCpuSetMembers));
                     for (uint32_t idxMember = g_aRtMpWinCpuGroups[idxGroup].cActiveCpus; idxMember < cMaxMembers; idxMember++)
                     {