Changeset 2464 in vbox

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

Files:

• include/VBox/pdm.h (modified) (3 diffs)
• include/VBox/tm.h (modified) (2 diffs)
• src/VBox/Devices/VMMDev/VBoxDev.cpp (modified) (2 diffs)
• src/VBox/VMM/PDMDevice.cpp (modified) (4 diffs)
• src/VBox/VMM/TM.cpp (modified) (1 diff)

trunk/include/VBox/pdm.h

@@ -4941 +4941 @@
     DECLR3CALLBACKMEMBER(int, pfnCritSectInit,(PPDMDEVINS pDevIns, PPDMCRITSECT pCritSect, const char *pszName));
 
+    /**
+     * Get the real world UCT time adjusted for VM lag.
+     *
+     * @returns pTime.
+     * @param   pDevIns         Device instance.
+     * @param   pTime           Where to store the time.
+     */
+    DECLR3CALLBACKMEMBER(PRTTIMESPEC, pfnUCTNow,(PPDMDEVINS pDevIns, PRTTIMESPEC pTime));
+
+    /** Space reserved for future members.
+     * @{ */
+    DECLR3CALLBACKMEMBER(void, pfnReserved1,(void));
+    DECLR3CALLBACKMEMBER(void, pfnReserved2,(void));
+    DECLR3CALLBACKMEMBER(void, pfnReserved3,(void));
+    DECLR3CALLBACKMEMBER(void, pfnReserved4,(void));
+    DECLR3CALLBACKMEMBER(void, pfnReserved5,(void));
+    DECLR3CALLBACKMEMBER(void, pfnReserved6,(void));
+    DECLR3CALLBACKMEMBER(void, pfnReserved7,(void));
+    DECLR3CALLBACKMEMBER(void, pfnReserved8,(void));
+    DECLR3CALLBACKMEMBER(void, pfnReserved9,(void));
+    DECLR3CALLBACKMEMBER(void, pfnReserved10,(void));
+    /** @} */
+
 
     /** API available to trusted devices only.
@@ -5263 +5286 @@
 
 /** Current PDMDEVHLP version number. */
-#define PDM_DEVHLP_VERSION  0xf2010000
+#define PDM_DEVHLP_VERSION  0xf2020000
 
 
@@ -5808 +5831 @@
 
 /**
+ * @copydoc PDMDEVHLP::pfnUCTNow
+ */
+DECLINLINE(PRTTIMESPEC) PDMDevHlpUCTNow(PPDMDEVINS pDevIns, PRTTIMESPEC pTime)
+{
+    return pDevIns->pDevHlp->pfnUCTNow(pDevIns, pTime);
+}
+
+/**
  * @copydoc PDMDEVHLP::pfnGetVM
  */

trunk/include/VBox/tm.h

@@ -25 +25 @@
 #include <VBox/cdefs.h>
 #include <VBox/types.h>
+#ifdef IN_RING3
+# include <iprt/time.h>
+#endif 
 
 __BEGIN_DECLS
@@ -723 +726 @@
 TMR3DECL(void) TMR3TimerQueuesDo(PVM pVM);
 
+/**
+ * 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);
 
 /** @} */

trunk/src/VBox/Devices/VMMDev/VBoxDev.cpp

@@ -364 +364 @@
         else
         {
-            pData->hostTime = RTTimeSpecGetMilli(RTTimeNow(&now));
+            pData->hostTime = RTTimeSpecGetMilli(PDMDevHlpUCTNow(pDevIns, &now));
             *pu32 = (uint32_t)(pData->hostTime >> 32);
         }
@@ -630 +630 @@
                 VMMDevReqHostTime *hostTimeReq = (VMMDevReqHostTime*)requestHeader;
                 RTTIMESPEC now;
-                hostTimeReq->time = RTTimeSpecGetMilli(RTTimeNow(&now));
+                hostTimeReq->time = RTTimeSpecGetMilli(PDMDevHlpUCTNow(pDevIns, &now));
                 requestHeader->rc = VINF_SUCCESS;
             }

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.
  *