Changeset 2859 in vbox for trunk/src

Timestamp:

May 24, 2007 9:15:01 PM (18 years ago)

Author:

vboxsync

Message:

some more.

Location:

trunk/src/VBox/VMM

Files:

• TM.cpp (modified) (5 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
             {
@@ -1452 +1452 @@
             "      u64VirtualSyncCatchUpPrev=%016RX64\n"
             "        u64VirtualSyncStoppedTS=%016RX64 %s by %#d (cur %#d)\n"
+            "     u32VirtualSyncStoppedCpuHz=%08RX32 (cur %08RX32)\n"
             "u32VirtualSyncCatchUpPercentage=%08RX32\n"
             "            fVirtualSyncTicking=%RTbool (prev=%RTbool)\n"
             "            fVirtualSyncCatchUp=%RTbool (prev=%RTbool)\n",
             u64Now,
-            u64Max, 
+            u64Max,
             pNext->u64Expire,
             pVM->tm.s.u64VirtualSync,
@@ -1467 +1468 @@
             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.u32VirtualSyncCatchUpPercentage,
-            pVM->tm.s.fVirtualSyncTicking, fWasTicking, 
+            pVM->tm.s.fVirtualSyncTicking, fWasTicking,
             pVM->tm.s.fVirtualSyncCatchUp, fWasInCatchup));
     Assert(u64Now <= u64VirtualNow - pVM->tm.s.offVirtualSyncGivenUp);
@@ -1638 +1640 @@
 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",
+            "                    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,
@@ -1662 +1666 @@
             u64Now,
             u64Max,
-            pVM->tm.s.u64VirtualSyncStoppedTS, pVM->tm.s.fVirtualSyncStoppedInGC ? "GC" : "R3", pVM->tm.s.u8VirtualSyncStoppedApicId, ASMGetApicId()));
+            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
                 STAM_COUNTER_INC(&pVM->tm.s.StatVirtualSyncGiveUpBeforeStarting);

trunk/src/VBox/VMM/TMInternal.h

@@ -345 +345 @@
 uint8_t volatile            u8VirtualSyncStoppedApicId;/**< for debugging - remove later */
 uint8_t au8PaddingDbg[2];/**< for debugging - remove later */
-uint32_t u32PaddingDbg;/**< 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

@@ -271 +271 @@
 #else
 pVM->tm.s.fVirtualSyncStoppedInGC = false;
-#endif 
+#endif
 pVM->tm.s.u8VirtualSyncStoppedApicId = ASMGetApicId();
+#ifdef IN_RING0
+PCSUPGLOBALINFOPAGE pGip = &g_SUPGlobalInfoPage;
+#else
+PCSUPGLOBALINFOPAGE pGip = g_pSUPGlobalInfoPage;
+#endif
+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;
+}
 //debugging - remove this later - end
             if (    fCheckTimers