Changeset 19324 in vbox

Timestamp:

May 4, 2009 12:51:27 PM (16 years ago)

Author:

vboxsync

Message:

fVirtualTicking -> cVirtualTicking. Turn on the virtual timer only from VCPU 0.

Location:

trunk/src/VBox/VMM

Files:

• EM.cpp (modified) (1 diff)
• TM.cpp (modified) (6 diffs)
• TMInternal.h (modified) (2 diffs)
• VMMAll/TMAllVirtual.cpp (modified) (6 diffs)
• testcase/tstVMStructGC.cpp (modified) (1 diff)

trunk/src/VBox/VMM/EM.cpp

@@ -3602 +3602 @@
          * Start the virtual time.
          */
-        rc = TMVirtualResume(pVM);
-        Assert(rc == VINF_SUCCESS);
+        if (pVCpu->idCpu == 0)
+        {
+            rc = TMVirtualResume(pVM);
+            Assert(rc == VINF_SUCCESS);
+        }
         rc = TMCpuTickResume(pVCpu);
         Assert(rc == VINF_SUCCESS);

trunk/src/VBox/VMM/TM.cpp

@@ -997 +997 @@
         Assert(!pVCpu->tm.s.fTSCTicking);
     }
-    Assert(!pVM->tm.s.fVirtualTicking);
+    Assert(!pVM->tm.s.cVirtualTicking);
     Assert(!pVM->tm.s.fVirtualSyncTicking);
 #endif
@@ -1048 +1048 @@
         Assert(!pVCpu->tm.s.fTSCTicking);
     }
-    Assert(!pVM->tm.s.fVirtualTicking);
+    Assert(!pVM->tm.s.cVirtualTicking);
     Assert(!pVM->tm.s.fVirtualSyncTicking);
 #endif
@@ -1064 +1064 @@
      * Load the virtual clock.
      */
-    pVM->tm.s.fVirtualTicking = false;
+    pVM->tm.s.cVirtualTicking = 0;
     /* the virtual clock. */
     uint64_t u64Hz;
@@ -1646 +1646 @@
     if (RT_UNLIKELY(!pNext))
     {
-        Assert(pVM->tm.s.fVirtualSyncTicking || !pVM->tm.s.fVirtualTicking);
+        Assert(pVM->tm.s.fVirtualSyncTicking || !pVM->tm.s.cVirtualTicking);
         return;
     }
@@ -1782 +1782 @@
      */
     if (    !pVM->tm.s.fVirtualSyncTicking
-        &&  pVM->tm.s.fVirtualTicking)
+        &&  pVM->tm.s.cVirtualTicking)
     {
         STAM_COUNTER_INC(&pVM->tm.s.StatVirtualSyncRunRestart);
@@ -2150 +2150 @@
                     " Virtual: %18RU64 (%#016RX64) %RU64Hz %s",
                     u64Virtual, u64Virtual, TMVirtualGetFreq(pVM),
-                    pVM->tm.s.fVirtualTicking ? "ticking" : "paused");
+                    pVM->tm.s.cVirtualTicking ? "ticking" : "paused");
     if (pVM->tm.s.fVirtualWarpDrive)
         pHlp->pfnPrintf(pHlp, " WarpDrive %RU32 %%", pVM->tm.s.u32VirtualWarpDrivePercentage);

trunk/src/VBox/VMM/TMInternal.h

@@ -310 +310 @@
     uint64_t                    cTSCTicksPerSecond;
 
-    /** Virtual time ticking enabled indicator (bool). (TMCLOCK_VIRTUAL) */
-    bool                        fVirtualTicking;
+    /** Virtual time ticking enabled indicator (counter for each VCPU). (TMCLOCK_VIRTUAL) */
+    uint32_t                    cVirtualTicking;
     /** Virtual time is not running at 100%. */
     bool                        fVirtualWarpDrive;
@@ -318 +318 @@
     /** Virtual timer synchronous time catch-up active. */
     bool volatile               fVirtualSyncCatchUp;
+    bool                        afAlignment[5]; /**< alignment padding */
     /** WarpDrive percentage.
      * 100% is normal (fVirtualSyncNormal == true). When other than 100% we apply

trunk/src/VBox/VMM/VMMAll/TMAllVirtual.cpp

@@ -327 +327 @@
 {
     uint64_t u64;
-    if (RT_LIKELY(pVM->tm.s.fVirtualTicking))
+    if (RT_LIKELY(pVM->tm.s.cVirtualTicking))
     {
         STAM_COUNTER_INC(&pVM->tm.s.StatVirtualGet);
@@ -413 +413 @@
          * Query the virtual clock and do the usual expired timer check.
          */
-        Assert(pVM->tm.s.fVirtualTicking);
+        Assert(pVM->tm.s.cVirtualTicking);
         u64 = tmVirtualGetRaw(pVM);
         if (    fCheckTimers
@@ -517 +517 @@
          */
         if (    fCheckTimers
-            &&  pVM->tm.s.fVirtualTicking
+            &&  pVM->tm.s.cVirtualTicking
             &&  !VM_FF_ISSET(pVM, VM_FF_TIMER))
         {
@@ -597 +597 @@
 VMMDECL(int) TMVirtualResume(PVM pVM)
 {
-    if (!pVM->tm.s.fVirtualTicking)
+    /** @note this is done only in specific cases (vcpu 0 init, termination, debug, out of memory conditions; 
+     *  there is at least a race for fVirtualSyncTicking. 
+     */
+    if (ASMAtomicIncU32(&pVM->tm.s.cVirtualTicking) == 1)
     {
         STAM_COUNTER_INC(&pVM->tm.s.StatVirtualResume);
-        pVM->tm.s.u64VirtualRawPrev = 0;
-        pVM->tm.s.u64VirtualWarpDriveStart = tmVirtualGetRawNanoTS(pVM);
-        pVM->tm.s.u64VirtualOffset = pVM->tm.s.u64VirtualWarpDriveStart - pVM->tm.s.u64Virtual;
-        pVM->tm.s.fVirtualTicking = true;
-        pVM->tm.s.fVirtualSyncTicking = true;
+        pVM->tm.s.u64VirtualRawPrev         = 0;
+        pVM->tm.s.u64VirtualWarpDriveStart  = tmVirtualGetRawNanoTS(pVM);
+        pVM->tm.s.u64VirtualOffset          = pVM->tm.s.u64VirtualWarpDriveStart - pVM->tm.s.u64Virtual;
+        pVM->tm.s.fVirtualSyncTicking       = true;
         return VINF_SUCCESS;
     }
-
-    AssertFailed();
-    return VERR_INTERNAL_ERROR;
+    AssertReturn(pVM->tm.s.cVirtualTicking < pVM->cCPUs, VERR_INTERNAL_ERROR);
+    return VINF_SUCCESS;
 }
 
@@ -622 +623 @@
 VMMDECL(int) TMVirtualPause(PVM pVM)
 {
-    if (pVM->tm.s.fVirtualTicking)
+    /** @note this is done only in specific cases (vcpu 0 init, termination, debug, out of memory conditions; 
+     *  there is at least a race for fVirtualSyncTicking. 
+     */
+    if (ASMAtomicDecU32(&pVM->tm.s.cVirtualTicking) == 0)
     {
         STAM_COUNTER_INC(&pVM->tm.s.StatVirtualPause);
-        pVM->tm.s.u64Virtual = tmVirtualGetRaw(pVM);
-        pVM->tm.s.fVirtualSyncTicking = false;
-        pVM->tm.s.fVirtualTicking = false;
+        pVM->tm.s.u64Virtual            = tmVirtualGetRaw(pVM);
+        pVM->tm.s.fVirtualSyncTicking   = false;
         return VINF_SUCCESS;
     }
-
-    AssertFailed();
-    return VERR_INTERNAL_ERROR;
+    AssertReturn(pVM->tm.s.cVirtualTicking < pVM->cCPUs, VERR_INTERNAL_ERROR);
+    return VINF_SUCCESS;
 }
 
@@ -696 +698 @@
      * the warp drive settings.
      */
-    bool fPaused = pVM->tm.s.fVirtualTicking;
+    bool fPaused = !!pVM->tm.s.cVirtualTicking;
     if (fPaused)
     {

trunk/src/VBox/VMM/testcase/tstVMStructGC.cpp

@@ -769 +769 @@
     GEN_CHECK_OFF(TMCPU, u64TSC);
     GEN_CHECK_OFF(TM, cTSCTicksPerSecond);
-    GEN_CHECK_OFF(TM, fVirtualTicking);
+    GEN_CHECK_OFF(TM, cVirtualTicking);
     GEN_CHECK_OFF(TM, fVirtualWarpDrive);
     GEN_CHECK_OFF(TM, fVirtualSyncTicking);