Changeset 2908 in vbox for trunk/src

Timestamp:

May 29, 2007 11:22:57 AM (18 years ago)

Author:

vboxsync

Message:

Removing the TM debug code.

Location:

trunk/src/VBox/VMM

Files:

• TM.cpp (modified) (5 diffs)
• TMInternal.h (modified) (1 diff)
• VMMAll/TMAllVirtual.cpp (modified) (3 diffs)

trunk/src/VBox/VMM/TM.cpp

@@ -1408 +1408 @@
     const uint64_t u64VirtualNow = TMVirtualGetEx(pVM, false /* don't check timers */);
     uint64_t u64Now;
-uint64_t off = 0, u64Delta = 0, u64Sub = 0;         /* debugging - to be removed */
-bool fWasInCatchup = false;                         /* debugging - to be removed */
-bool fWasTicking = pVM->tm.s.fVirtualSyncTicking;   /* debugging - to be removed*/
     if (!pVM->tm.s.fVirtualSyncTicking)
     {
@@ -1420 +1417 @@
     {
         /* Calc 'now'. (update order doesn't really matter here) */
-        /*uint64_t*/ off = pVM->tm.s.offVirtualSync;
+        uint64_t off = pVM->tm.s.offVirtualSync;
         if (pVM->tm.s.fVirtualSyncCatchUp)
         {
-fWasInCatchup = pVM->tm.s.fVirtualSyncCatchUp; /* debugging - to be removed */
-            /*uint64_t*/ u64Delta = u64VirtualNow - pVM->tm.s.u64VirtualSyncCatchUpPrev;
+            uint64_t u64Delta = u64VirtualNow - pVM->tm.s.u64VirtualSyncCatchUpPrev;
             if (RT_LIKELY(!(u64Delta >> 32)))
             {
-                /*uint64_t*/ u64Sub = ASMMultU64ByU32DivByU32(u64Delta, pVM->tm.s.u32VirtualSyncCatchUpPercentage, 100);
+                uint64_t u64Sub = ASMMultU64ByU32DivByU32(u64Delta, pVM->tm.s.u32VirtualSyncCatchUpPercentage, 100);
                 if (off > u64Sub + pVM->tm.s.offVirtualSyncGivenUp)
                 {
@@ -1464 +1460 @@
 
     /* assert sanity */
-if (RT_UNLIKELY(    !(u64Now <= u64VirtualNow - pVM->tm.s.offVirtualSyncGivenUp)
-                ||  !(u64Max <= u64VirtualNow - pVM->tm.s.offVirtualSyncGivenUp)
-                ||  !(u64Now <= u64Max)))
-{
-    LogRel(("TM: Add the following to defect #1414:\n"
-            "                         u64Now=%016RX64\n"
-            "                         u64Max=%016RX64\n"
-            "               pNext->u64Expire=%016RX64\n"
-            "                 u64VirtualSync=%016RX64\n"
-            "                  u64VirtualNow=%016RX64\n"
-            "                            off=%016RX64\n"
-            "                       u64Delta=%016RX64\n"
-            "                         u64Sub=%016RX64\n"
-            "                 offVirtualSync=%016RX64\n"
-            "          offVirtualSyncGivenUp=%016RX64\n"
-            "      u64VirtualSyncCatchUpPrev=%016RX64\n"
-            "        u64VirtualSyncStoppedTS=%016RX64\n"
-            "u32VirtualSyncCatchUpPercentage=%08RX32\n"
-            "            fVirtualSyncTicking=%RTbool (prev=%RTbool)\n"
-            "            fVirtualSyncCatchUp=%RTbool (prev=%RTbool)\n",
-            u64Now,
-            u64Max,
-            pNext->u64Expire,
-            pVM->tm.s.u64VirtualSync,
-            u64VirtualNow,
-            off,
-            u64Delta,
-            u64Sub,
-            pVM->tm.s.offVirtualSync,
-            pVM->tm.s.offVirtualSyncGivenUp,
-            pVM->tm.s.u64VirtualSyncCatchUpPrev,
-            pVM->tm.s.u64VirtualSyncStoppedTS,
-            pVM->tm.s.u32VirtualSyncCatchUpPercentage,
-            pVM->tm.s.fVirtualSyncTicking, fWasTicking,
-            pVM->tm.s.fVirtualSyncCatchUp, fWasInCatchup));
     Assert(u64Now <= u64VirtualNow - pVM->tm.s.offVirtualSyncGivenUp);
     Assert(u64Max <= u64VirtualNow - pVM->tm.s.offVirtualSyncGivenUp);
     Assert(u64Now <= u64Max);
-}
 
     /*
@@ -1572 +1532 @@
         const uint64_t u64VirtualNow2 = TMVirtualGetEx(pVM, false /* don't check timers */);
         Assert(u64VirtualNow2 >= u64VirtualNow);
-if (RT_UNLIKELY(u64VirtualNow2 < u64VirtualNow))  LogRel(("TM: u64VirtualNow2=%#RX64 < u64VirtualNow=%#RX64\n", u64VirtualNow2, u64VirtualNow)); /* debugging - to be removed. */
         AssertMsg(pVM->tm.s.u64VirtualSync >= u64Now, ("%RU64 < %RU64\n", pVM->tm.s.u64VirtualSync, u64Now));
         const uint64_t offSlack = pVM->tm.s.u64VirtualSync - u64Now;
-if (RT_UNLIKELY(offSlack & BIT64(63)))  LogRel(("TM: pVM->tm.s.u64VirtualSync=%#RX64 - u64Now=%#RX64 -> %#RX64\n", pVM->tm.s.u64VirtualSync, u64Now, offSlack)); /* debugging - to be removed. */
         STAM_STATS({
             if (offSlack)
@@ -1663 +1621 @@
             {
                 /* don't bother */
-if (offLag & BIT64(63)) //debugging - remove.
-    LogRel(("TM: offLag is negative! offLag=%RI64 (%#RX64) offNew=%#RX64 u64Elapsed=%#RX64 offSlack=%#RX64 u64VirtualNow2=%#RX64 u64VirtualNow=%#RX64 u64VirtualSync=%#RX64 offVirtualSyncGivenUp=%#RX64 u64Now=%#RX64 u64Max=%#RX64\n",
-            offLag, offLag, offNew, u64Elapsed, offSlack, u64VirtualNow2, u64VirtualNow, pVM->tm.s.u64VirtualSync, pVM->tm.s.offVirtualSyncGivenUp, u64Now, u64Max));
                 STAM_COUNTER_INC(&pVM->tm.s.StatVirtualSyncGiveUpBeforeStarting);
                 ASMAtomicXchgU64((uint64_t volatile *)&pVM->tm.s.offVirtualSyncGivenUp, offNew);

trunk/src/VBox/VMM/TMInternal.h

@@ -349 +349 @@
      * Thus the current lag is offVirtualSync - offVirtualSyncGivenUp. */
     uint64_t                    offVirtualSyncGivenUp;
-uint64_t volatile           u64VirtualSyncStoppedTS;/**< for debugging - remove later */
     /** The TMCLOCK_VIRTUAL at the previous TMVirtualGetSync call when catch-up is active. */
     uint64_t volatile           u64VirtualSyncCatchUpPrev;

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

@@ -210 +210 @@
     return u64NanoTS;
 }
-
 
 
@@ -349 +348 @@
         Assert(pVM->tm.s.fVirtualTicking);
         u64 = tmVirtualGetRaw(pVM);
-const uint64_t u64VirtualNow = u64;
         if (    fCheckTimers
             &&  !VM_FF_ISSET(pVM, VM_FF_TIMER)
@@ -428 +426 @@
             ASMAtomicXchgU64(&pVM->tm.s.u64VirtualSync, u64);
             ASMAtomicXchgBool(&pVM->tm.s.fVirtualSyncTicking, false);
-pVM->tm.s.u64VirtualSyncStoppedTS = u64VirtualNow;
             if (    fCheckTimers
                 &&  !VM_FF_ISSET(pVM, VM_FF_TIMER))