Changeset 19652 in vbox for trunk

Timestamp:

May 13, 2009 11:50:14 AM (16 years ago)

Author:

vboxsync

Message:

Added GVMMR0SchedPokeEx & GVMMR0SchedWakeUpEx

Location:

trunk

Files:

• include/VBox/gvmm.h (modified) (1 diff)
• src/VBox/VMM/VMMR0/GVMMR0.cpp (modified) (7 diffs)
• src/VBox/VMM/VMMR0/PDMR0Device.cpp (modified) (1 diff)

trunk/include/VBox/gvmm.h

@@ -146 +146 @@
 GVMMR0DECL(int)     GVMMR0SchedHalt(PVM pVM, VMCPUID idCpu, uint64_t u64ExpireGipTime);
 GVMMR0DECL(int)     GVMMR0SchedWakeUp(PVM pVM, VMCPUID idCpu);
+GVMMR0DECL(int)     GVMMR0SchedWakeUpEx(PVM pVM, VMCPUID idCpu, bool fTakeUsedLock);
 GVMMR0DECL(int)     GVMMR0SchedPoke(PVM pVM, VMCPUID idCpu);
+GVMMR0DECL(int)     GVMMR0SchedPokeEx(PVM pVM, VMCPUID idCpu, bool fTakeUsedLock);
 GVMMR0DECL(int)     GVMMR0SchedWakeUpAndPokeCpus(PVM pVM, PCVMCPUSET pSleepSet, PCVMCPUSET pPokeSet);
 GVMMR0DECL(int)     GVMMR0SchedPoll(PVM pVM, VMCPUID idCpu, bool fYield);

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

@@ -1618 +1618 @@
  * @param   pVM                 Pointer to the shared VM structure.
  * @param   idCpu               The Virtual CPU ID of the EMT to wake up.
+ * @param   fTakeUsedLock       Take the used lock or not
  * @thread  Any but EMT.
  */
-GVMMR0DECL(int) GVMMR0SchedWakeUp(PVM pVM, VMCPUID idCpu)
+GVMMR0DECL(int) GVMMR0SchedWakeUpEx(PVM pVM, VMCPUID idCpu, bool fTakeUsedLock)
 {
     /*
@@ -1627 +1628 @@
     PGVM pGVM;
     PGVMM pGVMM;
-    int rc = gvmmR0ByVM(pVM, &pGVM, &pGVMM, true /* fTakeUsedLock */);
+    int rc = gvmmR0ByVM(pVM, &pGVM, &pGVMM, fTakeUsedLock);
     if (RT_SUCCESS(rc))
     {
@@ -1655 +1656 @@
 }
 
+/**
+ * Wakes up the halted EMT thread so it can service a pending request.
+ *
+ * @returns VBox status code.
+ * @retval  VINF_SUCCESS if successfully woken up.
+ * @retval  VINF_GVM_NOT_BLOCKED if the EMT wasn't blocked.
+ *
+ * @param   pVM                 Pointer to the shared VM structure.
+ * @param   idCpu               The Virtual CPU ID of the EMT to wake up.
+ * @thread  Any but EMT.
+ */
+GVMMR0DECL(int) GVMMR0SchedWakeUp(PVM pVM, VMCPUID idCpu)
+{
+    return GVMMR0SchedWakeUpEx(pVM, idCpu, true /* fTakeUsedLock */);
+}
 
 /**
@@ -1683 +1699 @@
 }
 
-
 /**
  * Pokes an EMT if it's still busy running guest code.
@@ -1693 +1708 @@
  * @param   pVM                 Pointer to the shared VM structure.
  * @param   idCpu               The ID of the virtual CPU to poke.
- */
-GVMMR0DECL(int) GVMMR0SchedPoke(PVM pVM, VMCPUID idCpu)
+ * @param   fTakeUsedLock       Take the used lock or not
+ */
+GVMMR0DECL(int) GVMMR0SchedPokeEx(PVM pVM, VMCPUID idCpu, bool fTakeUsedLock)
 {
     /*
@@ -1701 +1717 @@
     PGVM pGVM;
     PGVMM pGVMM;
-    int rc = gvmmR0ByVM(pVM, &pGVM, &pGVMM, true /* fTakeUsedLock */);
+    int rc = gvmmR0ByVM(pVM, &pGVM, &pGVMM, fTakeUsedLock);
     if (RT_SUCCESS(rc))
     {
@@ -1715 +1731 @@
     LogFlow(("GVMMR0SchedWakeUpAndPokeCpus: returns %Rrc\n", rc));
     return rc;
-
+}
+
+
+/**
+ * Pokes an EMT if it's still busy running guest code.
+ *
+ * @returns VBox status code.
+ * @retval  VINF_SUCCESS if poked successfully.
+ * @retval  VINF_GVM_NOT_BUSY_IN_GC if the EMT wasn't busy in GC.
+ *
+ * @param   pVM                 Pointer to the shared VM structure.
+ * @param   idCpu               The ID of the virtual CPU to poke.
+ */
+GVMMR0DECL(int) GVMMR0SchedPoke(PVM pVM, VMCPUID idCpu)
+{
+    return GVMMR0SchedPokeEx(pVM, idCpu, true /* fTakeUsedLock */);
 }
 

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

@@ -445 +445 @@
         {
         case VMCPUSTATE_STARTED_EXEC:
-            GVMMR0SchedPoke(pVM, pVCpu->idCpu);
+            GVMMR0SchedPokeEx(pVM, pVCpu->idCpu, false /* don't take the used lock */);
             break;
 
         case VMCPUSTATE_STARTED_HALTED:
-            GVMMR0SchedWakeUp(pVM, pVCpu->idCpu);
+            GVMMR0SchedWakeUpEx(pVM, pVCpu->idCpu, false /* don't take the used lock */);
             break;
         }