Changeset 2075 in vbox for trunk

Timestamp:

Apr 13, 2007 12:59:25 PM (18 years ago)

Author:

vboxsync

Message:

Added TMVirtualGetEx.
Changed TMCpuTickGetOffset to return virtual tsc - host tsc.

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• TMAllCpu.cpp (modified) (3 diffs)
• TMAllVirtual.cpp (modified) (3 diffs)

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

@@ -40 +40 @@
  * Gets the raw cpu tick from current virtual time.
  */
-DECLINLINE(uint64_t) tmCpuTickGetRawVirtual(PVM pVM)
+DECLINLINE(uint64_t) tmCpuTickGetRawVirtual(PVM pVM, bool fCheckTimers = true)
 {
-    uint64_t u64 = TMVirtualGet(pVM);
+    uint64_t u64 = TMVirtualGetEx(pVM, fCheckTimers);
     if (u64 != TMCLOCK_FREQ_VIRTUAL)
         u64 = ASMMultU64ByU32DivByU32(u64, pVM->tm.s.cTSCTicksPerSecond, TMCLOCK_FREQ_VIRTUAL);
@@ -94 +94 @@
 
 /**
- * Returns the TSC offset
+ * Returns the TSC offset (virtual TSC - host TSC)
  *
  * @returns TSC ofset
@@ -101 +101 @@
 TMDECL(uint64_t) TMCpuTickGetOffset(PVM pVM)
 {
-    return pVM->tm.s.u64TSCOffset;
+    uint64_t u64;
+    if (RT_LIKELY(pVM->tm.s.fTSCTicking))
+    {
+        if (pVM->tm.s.fTSCVirtualized)
+        {
+            if (pVM->tm.s.fTSCUseRealTSC)
+                u64 = ASMReadTSC();
+            else
+                u64 = tmCpuTickGetRawVirtual(pVM, false /* don't check pending timers */);
+            u64 -= pVM->tm.s.u64TSCOffset;
+        }
+        else
+            u64 = ASMReadTSC();
+    }
+    else
+        u64 = pVM->tm.s.u64TSC;
+
+    return u64 - ASMReadTSC();
 }
 

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

@@ -102 +102 @@
 TMDECL(uint64_t) TMVirtualGet(PVM pVM)
 {
+    return TMVirtualGetEx(pVM, true /* check timers */);
+}
+
+/**
+ * Gets the current TMCLOCK_VIRTUAL time
+ *
+ * @returns The timestamp.
+ * @param   pVM             VM handle.
+ * @param   fCheckTimers    Check timers or not
+ *
+ * @remark  While the flow of time will never go backwards, the speed of the
+ *          progress varies due to inaccurate RTTimeNanoTS and TSC. The latter can be
+ *          influenced by power saving (SpeedStep, PowerNow!), while the former
+ *          makes use of TSC and kernel timers.
+ */
+TMDECL(uint64_t) TMVirtualGetEx(PVM pVM, bool fCheckTimers)
+{
     uint64_t u64;
     if (pVM->tm.s.fVirtualTicking)
@@ -111 +128 @@
          * Use the chance to check for expired timers.
          */
-        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
                  || (   pVM->tm.s.fVirtualSyncTicking
@@ -130 +148 @@
     return u64;
 }
-
 
 /**