Changeset 32953 in vbox for trunk/src/VBox/VMM

Timestamp:

Oct 6, 2010 3:53:27 PM (14 years ago)

Author:

vboxsync

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

66452

Message:

Finer grained cpu capping

Location:

trunk/src/VBox/VMM

Files:

• EM.cpp (modified) (6 diffs)
• EMHwaccm.cpp (modified) (2 diffs)
• EMRaw.cpp (modified) (2 diffs)
• include/internal/em.h (modified) (1 diff)

trunk/src/VBox/VMM/EM.cpp

@@ -55 +55 @@
 #include <VBox/patm.h>
 #include "EMInternal.h"
+#include "include/internal/em.h"
 #include <VBox/vm.h>
 #include <VBox/cpumdis.h>
@@ -960 +961 @@
          * Execute REM.
          */
-        STAM_PROFILE_START(&pVCpu->em.s.StatREMExec, c);
-        rc = REMR3Run(pVM, pVCpu);
-        STAM_PROFILE_STOP(&pVCpu->em.s.StatREMExec, c);
-
+        if (RT_LIKELY(EMR3IsExecutionAllowed(pVM, pVCpu)))
+        {
+            STAM_PROFILE_START(&pVCpu->em.s.StatREMExec, c);
+            rc = REMR3Run(pVM, pVCpu);
+            STAM_PROFILE_STOP(&pVCpu->em.s.StatREMExec, c);
+        }
+        else
+        {
+            /* Give up this time slice; virtual time continues */
+            STAM_REL_PROFILE_ADV_START(&pVCpu->em.s.StatCapped, u);
+            RTThreadSleep(2);
+            STAM_REL_PROFILE_ADV_STOP(&pVCpu->em.s.StatCapped, u);
+        }
 
         /*
@@ -1675 +1685 @@
  *
  */
-bool emR3IsExecutionAllowed(PVM pVM, PVMCPU pVCpu)
+VMMR3DECL(bool) EMR3IsExecutionAllowed(PVM pVM, PVMCPU pVCpu)
 {
     uint64_t u64UserTime, u64KernelTime;
@@ -2001 +2011 @@
                  */
                 case EMSTATE_RAW:
-                    if (emR3IsExecutionAllowed(pVM, pVCpu))
-                    {
-                        rc = emR3RawExecute(pVM, pVCpu, &fFFDone);
-                    }
-                    else
-                    {
-                        /* Give up this time slice; virtual time continues */
-                        STAM_REL_PROFILE_ADV_START(&pVCpu->em.s.StatCapped, u);
-                        RTThreadSleep(10);
-                        STAM_REL_PROFILE_ADV_STOP(&pVCpu->em.s.StatCapped, u);
-                        rc = VINF_SUCCESS;
-                    }
+                    rc = emR3RawExecute(pVM, pVCpu, &fFFDone);
                     break;
 
@@ -2019 +2018 @@
                  */
                 case EMSTATE_HWACC:
-                    if (emR3IsExecutionAllowed(pVM, pVCpu))
-                    {
-                        rc = emR3HwAccExecute(pVM, pVCpu, &fFFDone);
-                    }
-                    else
-                    {
-                        /* Give up this time slice; virtual time continues */
-                        STAM_REL_PROFILE_ADV_START(&pVCpu->em.s.StatCapped, u);
-                        RTThreadSleep(10);
-                        STAM_REL_PROFILE_ADV_STOP(&pVCpu->em.s.StatCapped, u);
-                        rc = VINF_SUCCESS;
-                    }
+                    rc = emR3HwAccExecute(pVM, pVCpu, &fFFDone);
                     break;
 
@@ -2037 +2025 @@
                  */
                 case EMSTATE_REM:
-                    if (emR3IsExecutionAllowed(pVM, pVCpu))
-                    {
-                        rc = emR3RemExecute(pVM, pVCpu, &fFFDone);
-                        Log2(("EMR3ExecuteVM: emR3RemExecute -> %Rrc\n", rc));
-                    }
-                    else
-                    {
-                        /* Give up this time slice; virtual time continues */
-                        STAM_REL_PROFILE_ADV_START(&pVCpu->em.s.StatCapped, u);
-                        RTThreadSleep(10);
-                        STAM_REL_PROFILE_ADV_STOP(&pVCpu->em.s.StatCapped, u);
-                        rc = VINF_SUCCESS;
-                    }
+                    rc = emR3RemExecute(pVM, pVCpu, &fFFDone);
+                    Log2(("EMR3ExecuteVM: emR3RemExecute -> %Rrc\n", rc));
                     break;
 

trunk/src/VBox/VMM/EMHwaccm.cpp

@@ -53 +53 @@
 #include <VBox/hwaccm.h>
 #include "EMInternal.h"
+#include "include/internal/em.h"
 #include <VBox/vm.h>
 #include <VBox/cpumdis.h>
@@ -544 +545 @@
          */
         STAM_PROFILE_ADV_STOP(&pVCpu->em.s.StatHwAccEntry, a);
-        STAM_PROFILE_START(&pVCpu->em.s.StatHwAccExec, x);
-        rc = VMMR3HwAccRunGC(pVM, pVCpu);
-        STAM_PROFILE_STOP(&pVCpu->em.s.StatHwAccExec, x);
+
+        if (RT_LIKELY(EMR3IsExecutionAllowed(pVM, pVCpu)))
+        {
+            STAM_PROFILE_START(&pVCpu->em.s.StatHwAccExec, x);
+            rc = VMMR3HwAccRunGC(pVM, pVCpu);
+            STAM_PROFILE_STOP(&pVCpu->em.s.StatHwAccExec, x);
+        }
+        else
+        {
+            /* Give up this time slice; virtual time continues */
+            STAM_REL_PROFILE_ADV_START(&pVCpu->em.s.StatCapped, u);
+            RTThreadSleep(2);
+            STAM_REL_PROFILE_ADV_STOP(&pVCpu->em.s.StatCapped, u);
+        }
+        
 
         /*

trunk/src/VBox/VMM/EMRaw.cpp

@@ -54 +54 @@
 #include <VBox/patm.h>
 #include "EMInternal.h"
+#include "include/internal/em.h"
 #include <VBox/vm.h>
 #include <VBox/cpumdis.h>
@@ -1528 +1529 @@
          */
         STAM_PROFILE_ADV_STOP(&pVCpu->em.s.StatRAWEntry, b);
-        STAM_PROFILE_START(&pVCpu->em.s.StatRAWExec, c);
-        rc = VMMR3RawRunGC(pVM, pVCpu);
-        STAM_PROFILE_STOP(&pVCpu->em.s.StatRAWExec, c);
+        if (RT_LIKELY(EMR3IsExecutionAllowed(pVM, pVCpu)))
+        {
+            STAM_PROFILE_START(&pVCpu->em.s.StatRAWExec, c);
+            rc = VMMR3RawRunGC(pVM, pVCpu);
+            STAM_PROFILE_STOP(&pVCpu->em.s.StatRAWExec, c);
+        }
+        else
+        {
+            /* Give up this time slice; virtual time continues */
+            STAM_REL_PROFILE_ADV_START(&pVCpu->em.s.StatCapped, u);
+            RTThreadSleep(2);
+            STAM_REL_PROFILE_ADV_STOP(&pVCpu->em.s.StatCapped, u);
+        }
         STAM_PROFILE_ADV_START(&pVCpu->em.s.StatRAWTail, d);
 

trunk/src/VBox/VMM/include/internal/em.h

@@ -24 +24 @@
 VMMR3DECL(int)  EMR3NotifySuspend(PVM pVM);
 
+VMMR3DECL(bool) EMR3IsExecutionAllowed(PVM pVM, PVMCPU pVCpu);
+
 #endif