Changeset 19500 in vbox for trunk/src/VBox

Timestamp:

May 7, 2009 6:23:22 PM (16 years ago)

Author:

vboxsync

Message:

TM: Moved the WarpDrive feature out of TMVirtual and made the setter ring-3 only.

Location:

trunk/src/VBox

Files:

• Main/MachineDebuggerImpl.cpp (modified) (2 diffs)
• VMM/TM.cpp (modified) (2 diffs)
• VMM/VMMAll/TMAll.cpp (modified) (1 diff)
• VMM/VMMAll/TMAllVirtual.cpp (modified) (2 diffs)
• VMM/testcase/tstAnimate.cpp (modified) (1 diff)
• VMM/testcase/tstVMM.cpp (modified) (1 diff)

trunk/src/VBox/Main/MachineDebuggerImpl.cpp

@@ -585 +585 @@
 
     if (pVM.isOk())
-        *aPct = TMVirtualGetWarpDrive (pVM);
+        *aPct = TMGetWarpDrive (pVM);
     else
         *aPct = 100;
@@ -618 +618 @@
     CheckComRCReturnRC (pVM.rc());
 
-    int vrc = TMVirtualSetWarpDrive (pVM, aPct);
+    int vrc = TMR3SetWarpDrive (pVM, aPct);
     if (RT_FAILURE (vrc))
     {

trunk/src/VBox/VMM/TM.cpp

@@ -166 +166 @@
 static void                 tmR3TimerQueueRun(PVM pVM, PTMTIMERQUEUE pQueue);
 static void                 tmR3TimerQueueRunVirtualSync(PVM pVM);
+static DECLCALLBACK(int)    tmR3SetWarpDrive(PVM pVM, uint32_t u32Percent);
 static DECLCALLBACK(void)   tmR3TimerInfo(PVM pVM, PCDBGFINFOHLP pHlp, const char *pszArgs);
 static DECLCALLBACK(void)   tmR3TimerInfoActive(PVM pVM, PCDBGFINFOHLP pHlp, const char *pszArgs);
@@ -2047 +2048 @@
 
 /**
+ * Sets the warp drive percent of the virtual time.
+ *
+ * @returns VBox status code.
+ * @param   pVM         The VM handle.
+ * @param   u32Percent  The new percentage. 100 means normal operation.
+ *
+ * @todo    Move to Ring-3!
+ */
+VMMDECL(int) TMR3SetWarpDrive(PVM pVM, uint32_t u32Percent)
+{
+    PVMREQ pReq;
+    int rc = VMR3ReqCall(pVM, VMCPUID_ANY, &pReq, RT_INDEFINITE_WAIT,
+                         (PFNRT)tmR3SetWarpDrive, 2, pVM, u32Percent);
+    if (RT_SUCCESS(rc))
+        rc = pReq->iStatus;
+    VMR3ReqFree(pReq);
+    return rc;
+}
+
+
+/**
+ * EMT worker for TMR3SetWarpDrive.
+ *
+ * @returns VBox status code.
+ * @param   pVM         The VM handle.
+ * @param   u32Percent  See TMR3SetWarpDrive().
+ * @internal
+ */
+static DECLCALLBACK(int) tmR3SetWarpDrive(PVM pVM, uint32_t u32Percent)
+{
+    PVMCPU pVCpu = VMMGetCpu(pVM);
+
+    /*
+     * Validate it.
+     */
+    AssertMsgReturn(u32Percent >= 2 && u32Percent <= 20000,
+                    ("%RX32 is not between 2 and 20000 (inclusive).\n", u32Percent),
+                    VERR_INVALID_PARAMETER);
+    tmLock(pVM); /* paranoia */
+
+/** @todo This isn't a feature specific to virtual time, move the variables to
+ * TM level and make it affect TMR3UCTNow as well! */
+
+    /*
+     * If the time is running we'll have to pause it before we can change
+     * the warp drive settings.
+     */
+    bool fPaused = !!pVM->tm.s.cVirtualTicking;
+    if (fPaused)
+    {
+        int rc = TMVirtualPause(pVM);
+        AssertRC(rc);
+        rc = TMCpuTickPause(pVCpu);
+        AssertRC(rc);
+    }
+
+    pVM->tm.s.u32VirtualWarpDrivePercentage = u32Percent;
+    pVM->tm.s.fVirtualWarpDrive = u32Percent != 100;
+    LogRel(("TM: u32VirtualWarpDrivePercentage=%RI32 fVirtualWarpDrive=%RTbool\n",
+            pVM->tm.s.u32VirtualWarpDrivePercentage, pVM->tm.s.fVirtualWarpDrive));
+
+    if (fPaused)
+    {
+        int rc = TMVirtualResume(pVM);
+        AssertRC(rc);
+        rc = TMCpuTickResume(pVCpu);
+        AssertRC(rc);
+    }
+
+    tmUnlock(pVM);
+    return VINF_SUCCESS;
+}
+
+
+
+
+/**
  * Display all timers.
  *

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

@@ -1714 +1714 @@
 #endif /* !VBOX_STRICT */
 
+
+/**
+ * Gets the current warp drive percent.
+ *
+ * @returns The warp drive percent.
+ * @param   pVM         The VM handle.
+ */
+VMMDECL(uint32_t) TMGetWarpDrive(PVM pVM)
+{
+    return pVM->tm.s.u32VirtualWarpDrivePercentage;
+}
+

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

@@ -41 +41 @@
 #include <iprt/asm.h>
 
-
-/*******************************************************************************
-*   Internal Functions                                                         *
-*******************************************************************************/
-static DECLCALLBACK(int) tmVirtualSetWarpDrive(PVM pVM, uint32_t u32Percent);
 
 
@@ -660 +655 @@
 
 /**
- * Gets the current warp drive percent.
- *
- * @returns The warp drive percent.
- * @param   pVM         The VM handle.
- */
-VMMDECL(uint32_t) TMVirtualGetWarpDrive(PVM pVM)
-{
-    return pVM->tm.s.u32VirtualWarpDrivePercentage;
-}
-
-
-/**
- * Sets the warp drive percent of the virtual time.
- *
- * @returns VBox status code.
- * @param   pVM         The VM handle.
- * @param   u32Percent  The new percentage. 100 means normal operation.
- */
-VMMDECL(int) TMVirtualSetWarpDrive(PVM pVM, uint32_t u32Percent)
-{
-/** @todo This isn't a feature specific to virtual time, move to TM level. (It
- * should affect the TMR3UCTNow as well! */
-#ifdef IN_RING3
-    PVMREQ pReq;
-    int rc = VMR3ReqCall(pVM, VMCPUID_ANY, &pReq, RT_INDEFINITE_WAIT, (PFNRT)tmVirtualSetWarpDrive, 2, pVM, u32Percent);
-    if (RT_SUCCESS(rc))
-        rc = pReq->iStatus;
-    VMR3ReqFree(pReq);
-    return rc;
-#else
-
-    return tmVirtualSetWarpDrive(pVM, u32Percent);
-#endif
-}
-
-
-/**
- * EMT worker for tmVirtualSetWarpDrive.
- *
- * @returns VBox status code.
- * @param   pVM         The VM handle.
- * @param   u32Percent  See TMVirtualSetWarpDrive().
- * @internal
- */
-static DECLCALLBACK(int) tmVirtualSetWarpDrive(PVM pVM, uint32_t u32Percent)
-{
-    PVMCPU pVCpu = VMMGetCpu(pVM);
-
-    /*
-     * Validate it.
-     */
-    AssertMsgReturn(u32Percent >= 2 && u32Percent <= 20000,
-                    ("%RX32 is not between 2 and 20000 (inclusive).\n", u32Percent),
-                    VERR_INVALID_PARAMETER);
-    tmLock(pVM);
-
-    /*
-     * If the time is running we'll have to pause it before we can change
-     * the warp drive settings.
-     */
-    bool fPaused = !!pVM->tm.s.cVirtualTicking;
-    if (fPaused)
-    {
-        int rc = TMVirtualPause(pVM);
-        AssertRC(rc);
-        rc = TMCpuTickPause(pVCpu);
-        AssertRC(rc);
-    }
-
-    pVM->tm.s.u32VirtualWarpDrivePercentage = u32Percent;
-    pVM->tm.s.fVirtualWarpDrive = u32Percent != 100;
-    LogRel(("TM: u32VirtualWarpDrivePercentage=%RI32 fVirtualWarpDrive=%RTbool\n",
-            pVM->tm.s.u32VirtualWarpDrivePercentage, pVM->tm.s.fVirtualWarpDrive));
-
-    if (fPaused)
-    {
-        int rc = TMVirtualResume(pVM);
-        AssertRC(rc);
-        rc = TMCpuTickResume(pVCpu);
-        AssertRC(rc);
-    }
-
-    tmUnlock(pVM);
-    return VINF_SUCCESS;
-}
-
-
-/**
  * Converts from virtual ticks to nanoseconds.
  *

trunk/src/VBox/VMM/testcase/tstAnimate.cpp

@@ -863 +863 @@
                     if (u32WarpDrive != 100)
                     {
-                        rc = TMVirtualSetWarpDrive(pVM, u32WarpDrive);
+                        rc = TMR3SetWarpDrive(pVM, u32WarpDrive);
                         if (RT_FAILURE(rc))
                             RTPrintf("warning: TMVirtualSetWarpDrive(,%u) -> %Rrc\n", u32WarpDrive, rc);

trunk/src/VBox/VMM/testcase/tstVMM.cpp

@@ -105 +105 @@
             PTMTIMER pTimer = apTimers[i];
 
-            if (cLeft == RT_ELEMENTS(apTimers) / 2
-                && TMTimerIsActive(pTimer))
+            if (    cLeft == RT_ELEMENTS(apTimers) / 2
+                &&  TMTimerIsActive(pTimer))
             {
-                rc = TMTimerStop(pTimer);
-                RTTEST_CHECK_MSG(hTest, RT_SUCCESS(rc), (hTest, "TMTimerStop: %Rrc\n",  rc));
+//                rc = TMTimerStop(pTimer);
+//                RTTEST_CHECK_MSG(hTest, RT_SUCCESS(rc), (hTest, "TMTimerStop: %Rrc\n",  rc));
             }
             else