Changeset 2884 in vbox for trunk/src

Timestamp:

May 25, 2007 4:57:28 PM (18 years ago)

Author:

vboxsync

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

21543

Message:

Abort any pending catchup and reset. Fixed broken DoQueuesRun statistics.

File:

• trunk/src/VBox/VMM/TM.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/TM.cpp

@@ -719 +719 @@
 
     /*
+     * Abort any pending catch up.
+     * This isn't perfect,
+     */
+    if (pVM->tm.s.fVirtualSyncCatchUp)
+    {
+        const uint64_t offVirtualNow = TMVirtualGetEx(pVM, false /* don't check timers */);
+        const uint64_t offVirtualSyncNow = TMVirtualSyncGetEx(pVM, false /* don't check timers */);
+        if (pVM->tm.s.fVirtualSyncCatchUp)
+        {
+            STAM_PROFILE_ADV_STOP(&pVM->tm.s.StatVirtualSyncCatchup, c);
+
+            const uint64_t offOld = pVM->tm.s.offVirtualSyncGivenUp;
+            const uint64_t offNew = offVirtualNow - offVirtualSyncNow;
+            Assert(offOld <= offNew);
+            ASMAtomicXchgU64((uint64_t volatile *)&pVM->tm.s.offVirtualSyncGivenUp, offNew);
+            ASMAtomicXchgU64((uint64_t volatile *)&pVM->tm.s.offVirtualSync, offNew);
+            ASMAtomicXchgBool(&pVM->tm.s.fVirtualSyncCatchUp, false);
+            LogRel(("TM: Aborting catch-up attempt on reset with a %RU64 ns lag on reset; new total: %RU64 ns\n", offOld - offNew, offNew));
+        }
+    }
+
+    /*
      * Process the queues.
      */
@@ -1228 +1250 @@
     tmTimerQueueSchedule(pVM, &pVM->tm.s.paTimerQueuesR3[TMCLOCK_VIRTUAL_SYNC]);
     STAM_PROFILE_ADV_SUSPEND(&pVM->tm.s.StatDoQueuesSchedule, s1);
-    STAM_PROFILE_ADV_STOP(&pVM->tm.s.StatDoQueuesRun, r1);
+    STAM_PROFILE_ADV_START(&pVM->tm.s.StatDoQueuesRun, r1);
     tmR3TimerQueueRunVirtualSync(pVM);
     STAM_PROFILE_ADV_SUSPEND(&pVM->tm.s.StatDoQueuesRun, r1);