Changeset 19657 in vbox

Timestamp:

May 13, 2009 12:40:19 PM (16 years ago)

Author:

vboxsync

Message:

Fixed new lock/unlock behaviour

File:

• trunk/src/VBox/VMM/VMMR0/GVMMR0.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/VMMR0/GVMMR0.cpp

@@ -1638 +1638 @@
             rc = gvmmR0SchedWakeUpOne(pGVM, &pGVM->aCpus[idCpu]);
 
-            /*
-             * While we're here, do a round of scheduling.
-             */
-            Assert(ASMGetFlags() & X86_EFL_IF);
-            const uint64_t u64Now = RTTimeNanoTS(); /* (GIP time) */
-            pGVM->gvmm.s.StatsSched.cWakeUpWakeUps += gvmmR0SchedDoWakeUps(pGVMM, u64Now);
+            if (fTakeUsedLock)
+            {
+                /*
+                 * While we're here, do a round of scheduling.
+                 */
+                Assert(ASMGetFlags() & X86_EFL_IF);
+                const uint64_t u64Now = RTTimeNanoTS(); /* (GIP time) */
+                pGVM->gvmm.s.StatsSched.cWakeUpWakeUps += gvmmR0SchedDoWakeUps(pGVMM, u64Now);
+            }
         }
         else
             rc = VERR_INVALID_CPU_ID;
 
-        int rc2 = gvmmR0UsedUnlock(pGVMM);
-        AssertRC(rc2);
+        if (fTakeUsedLock)
+        {
+            int rc2 = gvmmR0UsedUnlock(pGVMM);
+            AssertRC(rc2);
+        }
     }
 
@@ -1725 +1731 @@
             rc = VERR_INVALID_CPU_ID;
 
-        int rc2 = gvmmR0UsedUnlock(pGVMM);
-        AssertRC(rc2);
+        if (fTakeUsedLock)
+        {
+            int rc2 = gvmmR0UsedUnlock(pGVMM);
+            AssertRC(rc2);
+        }
     }