Changeset 99920 in vbox

Timestamp:

May 22, 2023 8:52:26 PM (2 years ago)

Author:

vboxsync

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

157563

Message:

VMM/EM: Time slice cleanups. Scm fixes.

Location:

trunk

Files:

• include/VBox/vmm/em.h (modified) (1 diff)
• src/VBox/VMM/VMMR3/EM.cpp (modified) (2 diffs)
• src/VBox/VMM/include/EMInline.h (modified) (1 diff)
• src/VBox/VMM/include/EMInternal.h (modified) (1 diff)

trunk/include/VBox/vmm/em.h

@@ -95 +95 @@
     EMSTATE_GURU_MEDITATION,
     /** Executing in IEM, falling back on REM if we cannot switch back to HM or
-     * RAW after a short while. 
+     * RAW after a short while.
      * @note obsolete, here only for saved state reasons.  */
     EMSTATE_IEM_THEN_REM_OBSOLETE,

trunk/src/VBox/VMM/VMMR3/EM.cpp

@@ -219 +219 @@
         pVCpu->em.s.enmState            = idCpu == 0 ? EMSTATE_NONE : EMSTATE_WAIT_SIPI;
         pVCpu->em.s.enmPrevState        = EMSTATE_NONE;
-        pVCpu->em.s.u64TimeSliceStart   = 0; /* paranoia */
+        pVCpu->em.s.msTimeSliceStart    = 0; /* paranoia */
         pVCpu->em.s.idxContinueExitRec  = UINT16_MAX;
 
@@ -2033 +2033 @@
     {
         uint64_t const msTimeNow = RTTimeMilliTS();
-        if (pVCpu->em.s.u64TimeSliceStart + EM_TIME_SLICE < msTimeNow)
+        if (pVCpu->em.s.msTimeSliceStart + EM_TIME_SLICE < msTimeNow)
         {
             /* New time slice. */
-            pVCpu->em.s.u64TimeSliceStart     = msTimeNow;
-            pVCpu->em.s.u64TimeSliceStartExec = cMsKernelTime + cMsUserTime;
-            pVCpu->em.s.u64TimeSliceExec      = 0;
-        }
-        pVCpu->em.s.u64TimeSliceExec = cMsKernelTime + cMsUserTime - pVCpu->em.s.u64TimeSliceStartExec;
-
-        bool const fRet = pVCpu->em.s.u64TimeSliceExec < (EM_TIME_SLICE * pVM->uCpuExecutionCap) / 100;
-        Log2(("emR3IsExecutionAllowed: start=%RX64 startexec=%RX64 exec=%RX64 (cap=%x)\n", pVCpu->em.s.u64TimeSliceStart,
-              pVCpu->em.s.u64TimeSliceStartExec, pVCpu->em.s.u64TimeSliceExec, (EM_TIME_SLICE * pVM->uCpuExecutionCap) / 100));
+            pVCpu->em.s.msTimeSliceStart      = msTimeNow;
+            pVCpu->em.s.cMsTimeSliceStartExec = cMsKernelTime + cMsUserTime;
+            pVCpu->em.s.cMsTimeSliceExec      = 0;
+        }
+        pVCpu->em.s.cMsTimeSliceExec = cMsKernelTime + cMsUserTime - pVCpu->em.s.cMsTimeSliceStartExec;
+
+        bool const fRet = pVCpu->em.s.cMsTimeSliceExec < (EM_TIME_SLICE * pVM->uCpuExecutionCap) / 100;
+        Log2(("emR3IsExecutionAllowed: start=%RX64 startexec=%RX64 exec=%RX64 (cap=%x)\n", pVCpu->em.s.msTimeSliceStart,
+              pVCpu->em.s.cMsTimeSliceStartExec, pVCpu->em.s.cMsTimeSliceExec, (EM_TIME_SLICE * pVM->uCpuExecutionCap) / 100));
         return fRet;
     }

trunk/src/VBox/VMM/include/EMInline.h

@@ -57 +57 @@
 #endif /* !VMM_INCLUDED_SRC_include_EMInline_h */
 
-

trunk/src/VBox/VMM/include/EMInternal.h

@@ -160 +160 @@
     uint8_t                 abPadding0[7];
 
-    /** Start of the current time slice in ms. */
-    uint64_t                u64TimeSliceStart;
-    /** Start of the current time slice in thread execution time (ms). */
-    uint64_t                u64TimeSliceStartExec;
-    /** Current time slice value. */
-    uint64_t                u64TimeSliceExec;
+    /** Start of the current time slice in ms (RTTimeMilliTS). */
+    uint64_t                msTimeSliceStart;
+    /** The sum of the RTThreadGetExecutionTimeMilli() values at the start of the
+     * current slice. */
+    uint64_t                cMsTimeSliceStartExec;
+    /** Number of milliseconds into the current time slice last we checked.
+     * This is in terms of the RTThreadGetExecutionTimeMilli() total, like for 
+     * cMsTimeSliceStartExec. */
+    uint64_t                cMsTimeSliceExec;
 
     /** Pending ring-3 I/O port access (VINF_EM_PENDING_R3_IOPORT_READ / VINF_EM_PENDING_R3_IOPORT_WRITE). */