Changeset 64281 in vbox for trunk/src/VBox/Runtime/common/time

Timestamp:

Oct 15, 2016 4:46:29 PM (9 years ago)

Author:

vboxsync

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

111296

Message:

IPRT,SUP: Major vboxdrv and GIP version change; more flexible processor group handling on Windows.

Location:

trunk/src/VBox/Runtime/common/time

Files:

• timesupref.cpp (modified) (1 diff)
• timesupref.h (modified) (1 diff)

trunk/src/VBox/Runtime/common/time/timesupref.cpp

@@ -37 +37 @@
 #include <iprt/asm-math.h>
 #include <iprt/asm-amd64-x86.h>
+#include <iprt/param.h>
 #include <VBox/sup.h>
 #ifdef IN_RC

trunk/src/VBox/Runtime/common/time/timesupref.h

@@ -101 +101 @@
             uint16_t const  iCpuSet  = uAux & (RTCPUSET_MAX_CPUS - 1);
 #  else
-            uint16_t const  iCpuSet  = pGip->aiFirstCpuSetIdxFromCpuGroup[(uAux >> 8) & UINT8_MAX] + (uAux & UINT8_MAX);
+            uint16_t        iCpuSet = 0;
+            uint16_t        offGipCpuGroup = pGip->aoffCpuGroup[(uAux >> 8) & UINT8_MAX];
+            if (offGipCpuGroup < pGip->cPages * PAGE_SIZE)
+            {
+                PSUPGIPCPUGROUP pGipCpuGroup = (PSUPGIPCPUGROUP)((uintptr_t)pGip + offGipCpuGroup);
+                if (   (uAux & UINT8_MAX) < pGipCpuGroup->cMaxMembers
+                    && pGipCpuGroup->aiCpuSetIdxs[uAux & UINT8_MAX] != -1)
+                    iCpuSet = pGipCpuGroup->aiCpuSetIdxs[uAux & UINT8_MAX];
+            }
 #  endif
             uint16_t const  iGipCpu  = pGip->aiCpuFromCpuSetIdx[iCpuSet];