Changeset 2965 in vbox

Timestamp:

May 31, 2007 5:22:32 PM (18 years ago)

Author:

vboxsync

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

21673

Message:

Forgot to commit this the other day...

File:

• trunk/src/VBox/VMM/VMEmt.cpp (modified) (9 diffs)

trunk/src/VBox/VMM/VMEmt.cpp

@@ -363 +363 @@
 
 /**
- * Method 1 - Block whenever possible, and when lagging behind 
+ * Method 1 - Block whenever possible, and when lagging behind
  * switch to spinning for 10-30ms with occational blocking until
  * the lag has been eliminated.
@@ -377 +377 @@
     bool fBlockOnce = false;
     bool fSpinning = false;
-    if (TMVirtualSyncGetCatchUpPct(pVM) /* non-zero if catching up */)
-    {
-        const uint64_t u64Lag = TMVirtualSyncGetLag(pVM);
-        fSpinning = u64Lag > 25000000 /* 25ms */;
-        if (fSpinning) 
-        {
-            if (!pVM->vm.s.Halt.Method12.u64StartSpinTS)
+    uint32_t u32CatchUpPct = TMVirtualSyncGetCatchUpPct(pVM);
+    if (u32CatchUpPct /* non-zero if catching up */)
+    {
+        if (pVM->vm.s.Halt.Method12.u64StartSpinTS)
+        {
+            fSpinning = TMVirtualSyncGetLag(pVM) >= 2*1000000;
+            if (fSpinning)
+            {
+                uint64_t u64Lag = TMVirtualSyncGetLag(pVM);
+                fBlockOnce = u64Now - pVM->vm.s.Halt.Method12.u64LastBlockTS
+                           > RT_MAX(5*1000000, RT_MIN(u64Lag / 4, 200*1000000));
+            }
+            else
+            {
+RTLogRelPrintf("Stopped spinning (%u ms)\n", (u64Now - pVM->vm.s.Halt.Method12.u64StartSpinTS) / 1000000);
+                pVM->vm.s.Halt.Method12.u64StartSpinTS = 0;
+            }
+        }
+        else
+        {
+            fSpinning = TMVirtualSyncGetLag(pVM) >= 20*1000000;
+            if (fSpinning)
                 pVM->vm.s.Halt.Method12.u64StartSpinTS = u64Now;
-            else if (u64Now - pVM->vm.s.Halt.Method12.u64LastBlockTS > 32000000 /* 32ms */)
-                fBlockOnce = true;
-        }
-        else if (pVM->vm.s.Halt.Method12.u64StartSpinTS)
-            pVM->vm.s.Halt.Method12.u64StartSpinTS = 0;
+        }
     }
     else if (pVM->vm.s.Halt.Method12.u64StartSpinTS)
+    {
+RTLogRelPrintf("Stopped spinning (%u ms)\n", (u64Now - pVM->vm.s.Halt.Method12.u64StartSpinTS) / 1000000);
         pVM->vm.s.Halt.Method12.u64StartSpinTS = 0;
+    }
 
     /*
@@ -403 +417 @@
     {
         /*
-         * Work the timers and check if we can exit. 
+         * Work the timers and check if we can exit.
          */
         STAM_REL_PROFILE_START(&pVM->vm.s.StatHaltPoll, a);
@@ -424 +438 @@
          * Block if we're not spinning and the interval isn't all that small.
          */
-        if (    (   !fSpinning  
+        if (    (   !fSpinning
                  || fBlockOnce)
             &&  u64NanoTS >= 250000) /* 0.250 ms */
@@ -434 +448 @@
             if (cMilliSecs <= pVM->vm.s.Halt.Method12.cNSBlockedTooLongAvg)
                 cMilliSecs = 1;
-            else 
+            else
                 cMilliSecs -= pVM->vm.s.Halt.Method12.cNSBlockedTooLongAvg;
-//RTLogRelPrintf("u64NanoTS=%RI64 cLoops=%3d sleep %02dms (%7RU64) ", u64NanoTS, cLoops, cMilliSecs, u64NanoTS);
+RTLogRelPrintf("u64NanoTS=%RI64 cLoops=%3d sleep %02dms (%7RU64) ", u64NanoTS, cLoops, cMilliSecs, u64NanoTS);
             STAM_REL_PROFILE_START(&pVM->vm.s.StatHaltBlock, a);
             rc = RTSemEventWait(pVM->vm.s.EventSemWait, cMilliSecs);
@@ -451 +465 @@
             }
 
-            /* 
-             * Calc the statistics. 
+            /*
+             * Calc the statistics.
              * Update averages every 16th time, and flush parts of the history every 64th time.
              */
@@ -469 +483 @@
                 }
             }
-//RTLogRelPrintf(" -> %7RU64 ns / %7RI64 ns delta%s\n", Elapsed, Elapsed - u64NanoTS, fBlockOnce ? " (block once)" : "");
+RTLogRelPrintf(" -> %7RU64 ns / %7RI64 ns delta%s\n", Elapsed, Elapsed - u64NanoTS, fBlockOnce ? " (block once)" : "");
 
             /*
@@ -479 +493 @@
         }
     }
+if (fSpinning) RTLogRelPrintf("spun for %RU64 ns %u loops; lag=%RU64 pct=%d\n", RTTimeNanoTS() - u64Now, cLoops, TMVirtualSyncGetLag(pVM), u32CatchUpPct);
 
     return rc;
@@ -546 +561 @@
 #else
 # error "misconfigured halt"
-#endif 
+#endif
 
     /*