Changeset 2744 in vbox for trunk/src

Timestamp:

May 21, 2007 3:21:25 PM (18 years ago)

Author:

vboxsync

Message:

Gather some more info on that TM.cpp assertion...

Location:

trunk/src/VBox/VMM

Files:

• TM.cpp (modified) (4 diffs)
• TMInternal.h (modified) (1 diff)
• VMMAll/TMAll.cpp (modified) (2 diffs)
• VMMAll/TMAllVirtual.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/TM.cpp

@@ -1368 +1368 @@
     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 */
+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)
     {
@@ -1423 +1424 @@
 
     /* assert sanity */
-#ifdef VBOX_STRICT /* debugging - remove all but the assertions. */
 if (RT_UNLIKELY(    !(u64Now <= u64VirtualNow - pVM->tm.s.offVirtualSyncGivenUp)
                 ||  !(u64Max <= u64VirtualNow - pVM->tm.s.offVirtualSyncGivenUp)
                 ||  !(u64Now <= u64Max)))
 {
-    AssertMsg2("Add the following to defect #1414:\n"
-               "                         u64Now=%016RX64\n"
-               "                         u64Max=%016RX64\n"
-               "               pNext->u64Expire=%016RX64\n"
-               "                  u64VirtualNow=%016RX64\n"
-               "                            off=%016RX64\n"
-               "                       u64Delta=%016RX64\n"
-               "                         u64Sub=%016RX64\n"
-               "                 offVirtualSync=%016RX64\n"
-               "          offVirtualSyncGivenUp=%016RX64\n"
-               "      u64VirtualSyncCatchUpPrev=%016RX64\n"
-               "u32VirtualSyncCatchUpPercentage=%08RX32\n"
-               "            fVirtualSyncTicking=%RTbool\n"
-               "            fVirtualSyncCatchUp=%RTbool (prev=%RTbool)\n",
-               u64Now,
-               u64Max,
-               pNext->u64Expire,
-               u64VirtualNow,
-               off,
-               u64Delta,
-               u64Sub,
-               pVM->tm.s.offVirtualSync,
-               pVM->tm.s.offVirtualSyncGivenUp,
-               pVM->tm.s.u64VirtualSyncCatchUpPrev,
-               pVM->tm.s.u32VirtualSyncCatchUpPercentage,
-               pVM->tm.s.fVirtualSyncTicking,
-               pVM->tm.s.fVirtualSyncCatchUp, fWasInCatchup);
+    LogRel(("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);
 }
-#endif
 
     /*
@@ -1617 +1620 @@
             else
             {
-                /* not bother */
+                /* don't bother */
                 STAM_COUNTER_INC(&pVM->tm.s.StatVirtualSyncGiveUpBeforeStarting);
                 ASMAtomicXchgU64((uint64_t volatile *)&pVM->tm.s.offVirtualSyncGivenUp, offNew);
@@ -1628 +1631 @@
          * Update the offset and restart the clock.
          */
+        Assert(!(offNew & RT_BIT_64(63)));
         ASMAtomicXchgU64(&pVM->tm.s.offVirtualSync, offNew);
         ASMAtomicXchgBool(&pVM->tm.s.fVirtualSyncTicking, true);

trunk/src/VBox/VMM/TMInternal.h

@@ -341 +341 @@
      * 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/TMAll.cpp

@@ -178 +178 @@
 
     /* 
-     * TMCLOCK_VIRTUAL_SYNC 
+     * TMCLOCK_VIRTUAL_SYNC
      * This isn't quite as stright forward if in a catch-up, not only do 
      * we have to adjust the 'now' but when have to adjust the delta as well.
@@ -226 +226 @@
 }
 #endif
+
 
 /**

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

@@ -184 +184 @@
         Assert(pVM->tm.s.fVirtualTicking);
         u64 = tmVirtualGetRaw(pVM);
+const uint64_t u64VirtualNow = u64;
         if (    fCheckTimers
             &&  !VM_FF_ISSET(pVM, VM_FF_TIMER)
@@ -264 +265 @@
             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))