Changeset 2861 in vbox

Timestamp:

May 25, 2007 3:03:24 AM (18 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

21512

Message:

Backed out 21511,21510 and 21508

Location:

trunk/src/VBox/VMM

Files:

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

trunk/src/VBox/VMM/TM.cpp

@@ -573 +573 @@
             if (tmR3HasFixedTSC())
                 /* Sleep a bit to get a more reliable CpuHz value. */
-                RTThreadSleep(32);
+                RTThreadSleep(32);              
             else
             {
@@ -1451 +1451 @@
             "          offVirtualSyncGivenUp=%016RX64\n"
             "      u64VirtualSyncCatchUpPrev=%016RX64\n"
-            "        u64VirtualSyncStoppedTS=%016RX64 %s by %#d (cur %#d)\n"
-            "     u32VirtualSyncStoppedCpuHz=%08RX32 (cur %08RX32)\n"
+            "        u64VirtualSyncStoppedTS=%016RX64\n"
             "u32VirtualSyncCatchUpPercentage=%08RX32\n"
             "            fVirtualSyncTicking=%RTbool (prev=%RTbool)\n"
             "            fVirtualSyncCatchUp=%RTbool (prev=%RTbool)\n",
             u64Now,
-            u64Max,
+            u64Max, 
             pNext->u64Expire,
             pVM->tm.s.u64VirtualSync,
@@ -1467 +1466 @@
             pVM->tm.s.offVirtualSyncGivenUp,
             pVM->tm.s.u64VirtualSyncCatchUpPrev,
-            pVM->tm.s.u64VirtualSyncStoppedTS, pVM->tm.s.fVirtualSyncStoppedInGC ? "GC" : "R3", pVM->tm.s.u8VirtualSyncStoppedApicId, ASMGetApicId(),
-            pVM->tm.s.u32VirtualSyncStoppedCpuHz, (uint32_t)SUPGetCpuHzFromGIP(g_pSUPGlobalInfoPage),
+            pVM->tm.s.u64VirtualSyncStoppedTS,
             pVM->tm.s.u32VirtualSyncCatchUpPercentage,
-            pVM->tm.s.fVirtualSyncTicking, fWasTicking,
+            pVM->tm.s.fVirtualSyncTicking, fWasTicking, 
             pVM->tm.s.fVirtualSyncCatchUp, fWasInCatchup));
     Assert(u64Now <= u64VirtualNow - pVM->tm.s.offVirtualSyncGivenUp);
@@ -1636 +1634 @@
             {
                 /* don't bother */
-//debugging - remove - start
-static unsigned s_cRelLogEntries = 0;
-if (offLag > _1P && s_cRelLogEntries++ < 128)
-    LogRel(("TM: offLag=%RI64 is way too large/negative! Please add this to #1414.\n"
-            "                    offLag=%016RX64\n"
-            "                    offNew=%016RX64\n"
-            "                u64Elapsed=%016RX64\n"
-            "                  offSlack=%016RX64\n"
-            "            u64VirtualNow2=%016RX64\n"
-            "             u64VirtualNow=%016RX64\n"
-            "            u64VirtualSync=%016RX64\n"
-            "            offVirtualSync=%016RX64\n"
-            "     offVirtualSyncGivenUp=%016RX64\n"
-            "                    u64Now=%016RX64\n"
-            "                    u64Max=%016RX64\n"
-            "   u64VirtualSyncStoppedTS=%016RX64 %s by %#d (cur %#d)\n"
-            "u32VirtualSyncStoppedCpuHz=%08RX32 (cur %08RX32)\n"
-            ,
-            offLag,
-            offLag,
-            offNew,
-            u64Elapsed,
-            offSlack,
-            u64VirtualNow2,
-            u64VirtualNow,
-            pVM->tm.s.u64VirtualSync,
-            pVM->tm.s.offVirtualSync,
-            pVM->tm.s.offVirtualSyncGivenUp,
-            u64Now,
-            u64Max,
-            pVM->tm.s.u64VirtualSyncStoppedTS, pVM->tm.s.fVirtualSyncStoppedInGC ? "GC" : "R3", pVM->tm.s.u8VirtualSyncStoppedApicId, ASMGetApicId(),
-            pVM->tm.s.u32VirtualSyncStoppedCpuHz, (uint32_t)SUPGetCpuHzFromGIP(g_pSUPGlobalInfoPage)
-            ));
-//debugging - remove - end
+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

@@ -342 +342 @@
     uint64_t                    offVirtualSyncGivenUp;
 uint64_t volatile           u64VirtualSyncStoppedTS;/**< for debugging - remove later */
-bool volatile               fVirtualSyncStoppedInGC;/**< for debugging - remove later */
-uint8_t volatile            u8VirtualSyncStoppedApicId;/**< for debugging - remove later */
-uint8_t au8PaddingDbg[2];/**< for debugging - remove later */
-uint32_t u32VirtualSyncStoppedCpuHz;/**< 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

@@ -265 +265 @@
             ASMAtomicXchgU64(&pVM->tm.s.u64VirtualSync, u64);
             ASMAtomicXchgBool(&pVM->tm.s.fVirtualSyncTicking, false);
-//debugging - remove this later - start
 pVM->tm.s.u64VirtualSyncStoppedTS = u64VirtualNow;
-#ifdef IN_GC
-pVM->tm.s.fVirtualSyncStoppedInGC = true;
-#else
-pVM->tm.s.fVirtualSyncStoppedInGC = false;
-#endif
-pVM->tm.s.u8VirtualSyncStoppedApicId = ASMGetApicId();
-#ifndef IN_RING0
-PCSUPGLOBALINFOPAGE pGip = g_pSUPGlobalInfoPage;
-if (pGip)
-{
-    PCSUPGIPCPU pCpu = &pGip->aCPUs[0];
-    if (pGip->u32Mode == SUPGIPMODE_ASYNC_TSC)
-        pCpu = &pGip->aCPUs[pVM->tm.s.u8VirtualSyncStoppedApicId];
-    pVM->tm.s.u32VirtualSyncStoppedCpuHz = (uint32_t)pCpu->u64CpuHz;
-}
-#endif
-//debugging - remove this later - end
             if (    fCheckTimers
                 &&  !VM_FF_ISSET(pVM, VM_FF_TIMER))