Changeset 2464 in vbox for trunk/src/VBox/VMM

Timestamp:

May 3, 2007 3:09:01 PM (18 years ago)

Author:

vboxsync

Message:

Added TMR3UCTNow, exported it as a DevHlp and made VMMDev use it as time source. TMR3UCTNow adjust for lag we intend to catchup so the guest time wont run ahead of real-world time.

Location:

trunk/src/VBox/VMM

Files:

• PDMDevice.cpp (modified) (4 diffs)
• TM.cpp (modified) (1 diff)

trunk/src/VBox/VMM/PDMDevice.cpp

@@ -126 +126 @@
 static DECLCALLBACK(void) pdmR3DevHlp_STAMRegisterV(PPDMDEVINS pDevIns, void *pvSample, STAMTYPE enmType, STAMVISIBILITY enmVisibility, STAMUNIT enmUnit, const char *pszDesc, const char *pszName, va_list args);
 static DECLCALLBACK(int) pdmR3DevHlp_CritSectInit(PPDMDEVINS pDevIns, PPDMCRITSECT pCritSect, const char *pszName);
+static DECLCALLBACK(PRTTIMESPEC) pdmR3DevHlp_UCTNow(PPDMDEVINS pDevIns, PRTTIMESPEC pTime);
 
 static DECLCALLBACK(PVM) pdmR3DevHlp_GetVM(PPDMDEVINS pDevIns);
@@ -307 +308 @@
     pdmR3DevHlp_PDMQueueCreate,
     pdmR3DevHlp_CritSectInit,
+    pdmR3DevHlp_UCTNow,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
     pdmR3DevHlp_GetVM,
     pdmR3DevHlp_PCIBusRegister,
@@ -380 +392 @@
     pdmR3DevHlp_PDMQueueCreate,
     pdmR3DevHlp_CritSectInit,
+    pdmR3DevHlp_UCTNow,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
     pdmR3DevHlp_Untrusted_GetVM,
     pdmR3DevHlp_Untrusted_PCIBusRegister,
@@ -2271 +2294 @@
 
 
+/** @copydoc PDMDEVHLP::pfnUCTNow */
+static DECLCALLBACK(PRTTIMESPEC) pdmR3DevHlp_UCTNow(PPDMDEVINS pDevIns, PRTTIMESPEC pTime)
+{
+    PDMDEV_ASSERT_DEVINS(pDevIns);
+    LogFlow(("pdmR3DevHlp_UCTNow: caller='%s'/%d: pTime=%p\n", 
+             pDevIns->pDevReg->szDeviceName, pDevIns->iInstance, pTime));
+
+    pTime = TMR3UCTNow(pDevIns->Internal.s.pVMHC, pTime);
+
+    LogFlow(("pdmR3DevHlp_UCTNow: caller='%s'/%d: returns %RU64\n", pDevIns->pDevReg->szDeviceName, pDevIns->iInstance, RTTimeSpecGetNano(pTime)));
+    return pTime;
+}
+
+
 /** @copydoc PDMDEVHLP::pfnGetVM */
 static DECLCALLBACK(PVM) pdmR3DevHlp_GetVM(PPDMDEVINS pDevIns)

trunk/src/VBox/VMM/TM.cpp

@@ -1615 +1615 @@
 
 /**
+ * Get the real world UCT time adjusted for VM lag.
+ *
+ * @returns pTime.
+ * @param   pVM             The VM instance.
+ * @param   pTime           Where to store the time.
+ */
+TMR3DECL(PRTTIMESPEC) TMR3UCTNow(PVM pVM, PRTTIMESPEC pTime)
+{
+    RTTimeNow(pTime);
+    RTTimeSpecSubNano(pTime, pVM->tm.s.offVirtualSync - pVM->tm.s.offVirtualSyncGivenUp);
+    return pTime;
+}
+
+
+/**
  * Display all timers.
  *