Changeset 20675 in vbox

Timestamp:

Jun 18, 2009 8:49:43 AM (16 years ago)

Author:

vboxsync

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

48777

Message:

VMM: Reimplemented TMCpuTickSet.

File:

• trunk/src/VBox/VMM/VMMAll/TMAllCpu.cpp (modified) (3 diffs)

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

@@ -64 +64 @@
         if (pVM->tm.s.fTSCVirtualized)
         {
+            /** @todo Test that pausing and resuming doesn't cause lag! (I.e. that we're
+             *        unpaused before the virtual time and stopped after it. */
             if (pVM->tm.s.fTSCUseRealTSC)
                 pVCpu->tm.s.u64TSCOffset = ASMReadTSC() - pVCpu->tm.s.u64TSC;
@@ -95 +97 @@
     AssertFailed();
     return VERR_INTERNAL_ERROR;
-}
-
-
-/**
- * Pauses the CPU timestamp counter ticking.
- *
- * @returns VBox status code.
- * @param   pVCpu       The VMCPU to operate on.
- * @todo replace this with TMNotifySuspend
- */
-VMMDECL(int) TMCpuTickPause(PVMCPU pVCpu)
-{
-    PVM pVM = pVCpu->CTX_SUFF(pVM);
-
-    if (!pVM->tm.s.fTSCTiedToExecution)
-        return tmCpuTickPause(pVM, pVCpu);
-    /* ignored */
-    return VINF_SUCCESS;
 }
 
@@ -266 +250 @@
 VMMDECL(int) TMCpuTickSet(PVMCPU pVCpu, uint64_t u64Tick)
 {
-    Assert(!pVCpu->tm.s.fTSCTicking);
+    /*
+     * This is easier to do when the TSC is paused since resume will
+     * do all the calcuations for us.
+     */
+    PVM     pVM         = pVCpu->CTX_SUFF(pVM);
+    bool    fTSCTicking = pVCpu->tm.s.fTSCTicking;
+    if (fTSCTicking)
+        tmCpuTickPause(pVM, pVCpu);
     pVCpu->tm.s.u64TSC = u64Tick;
+
+    if (fTSCTicking)
+        tmCpuTickResume(pVM, pVCpu);
+    /** @todo Try help synchronizing it better among the virtual CPUs? */
     return VINF_SUCCESS;
 }