Changeset 2551 in vbox for trunk/src/VBox

Timestamp:

May 9, 2007 12:05:52 PM (18 years ago)

Author:

vboxsync

Message:

Added TMVirtualSyncGetEx. Do not check timers in TMCpuTickGetOffset.

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• TMAllCpu.cpp (modified) (1 diff)
• TMAllVirtual.cpp (modified) (4 diffs)

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

@@ -42 +42 @@
 DECLINLINE(uint64_t) tmCpuTickGetRawVirtual(PVM pVM, bool fCheckTimers)
 {
-    uint64_t u64 = TMVirtualSyncGet(pVM/** @todo fCheckTimers */);
+    uint64_t u64 = TMVirtualSyncGetEx(pVM, fCheckTimers);
     if (u64 != TMCLOCK_FREQ_VIRTUAL)
         u64 = ASMMultU64ByU32DivByU32(u64, pVM->tm.s.cTSCTicksPerSecond, TMCLOCK_FREQ_VIRTUAL);

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

@@ -167 +167 @@
  * @returns The timestamp.
  * @param   pVM     VM handle.
+ * @param   fCheckTimers    Check timers or not
  * @thread  EMT.
  */
-TMDECL(uint64_t) TMVirtualSyncGet(PVM pVM)
+TMDECL(uint64_t) TMVirtualSyncGetEx(PVM pVM, bool fCheckTimers)
 {
     VM_ASSERT_EMT(pVM);
@@ -183 +184 @@
         Assert(pVM->tm.s.fVirtualTicking);
         u64 = tmVirtualGetRaw(pVM);
-        if (    !VM_FF_ISSET(pVM, VM_FF_TIMER)
+        if (    fCheckTimers
+            &&  !VM_FF_ISSET(pVM, VM_FF_TIMER)
             &&  pVM->tm.s.CTXALLSUFF(paTimerQueues)[TMCLOCK_VIRTUAL].u64Expire <= u64)
         {
@@ -262 +264 @@
             ASMAtomicXchgU64(&pVM->tm.s.u64VirtualSync, u64);
             ASMAtomicXchgBool(&pVM->tm.s.fVirtualSyncTicking, false);
-            if (!VM_FF_ISSET(pVM, VM_FF_TIMER))
+            if (    fCheckTimers
+                &&  !VM_FF_ISSET(pVM, VM_FF_TIMER))
             {
                 VM_FF_SET(pVM, VM_FF_TIMER);
@@ -283 +286 @@
 
 /**
+ * Gets the current TMCLOCK_VIRTUAL_SYNC time.
+ *
+ * @returns The timestamp.
+ * @param   pVM             VM handle.
+ * @thread  EMT.
+ */
+TMDECL(uint64_t) TMVirtualSyncGet(PVM pVM)
+{
+    return TMVirtualSyncGetEx(pVM, true /* check timers */);
+}
+
+
+/**
  * Gets the current lag of the synchronous virtual clock (relative to the virtual clock).
  *