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

Timestamp:

Oct 10, 2007 2:21:27 PM (17 years ago)

Author:

vboxsync

Message:

Backed out [25153] as the multiple event APIs are missing on linux and windows.

Location:

trunk/src/VBox/VMM/VMMR0

Files:

• GVMMR0.cpp (modified) (8 diffs)
• GVMMR0Internal.h (modified) (1 diff)

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

@@ -476 +476 @@
     pGVM->gvmm.s.VMPagesMemObj = NIL_RTR0MEMOBJ;
     pGVM->gvmm.s.VMPagesMapObj = NIL_RTR0MEMOBJ;
-    pGVM->gvmm.s.HaltEventMulti = NIL_RTSEMEVENTMULTI;
+    pGVM->gvmm.s.HaltEvent = NIL_RTSEMEVENT;
 }
 
@@ -559 +559 @@
     if (RT_SUCCESS(rc))
     {
-        if (pGVM->gvmm.s.HaltEventMulti == NIL_RTSEMEVENTMULTI)
-        {
-            rc = RTSemEventMultiCreate(&pGVM->gvmm.s.HaltEventMulti);
+        if (pGVM->gvmm.s.HaltEvent == NIL_RTSEMEVENT)
+        {
+            rc = RTSemEventCreate(&pGVM->gvmm.s.HaltEvent);
             if (RT_FAILURE(rc))
-                pGVM->gvmm.s.HaltEventMulti = NIL_RTSEMEVENTMULTI;
+                pGVM->gvmm.s.HaltEvent = NIL_RTSEMEVENT;
         }
         else
@@ -1129 +1129 @@
                 {
                     ASMAtomicXchgU64(&pCurGVM->gvmm.s.u64HaltExpire, 0);
-                    int rc = RTSemEventMultiSignal(pCurGVM->gvmm.s.HaltEventMulti);
+                    int rc = RTSemEventSignal(pCurGVM->gvmm.s.HaltEvent);
                     AssertRC(rc);
                     cWoken++;
@@ -1158 +1158 @@
             {
                 ASMAtomicXchgU64(&pCurGVM->gvmm.s.u64HaltExpire, 0);
-                int rc = RTSemEventMultiSignal(pCurGVM->gvmm.s.HaltEventMulti);
+                int rc = RTSemEventSignal(pCurGVM->gvmm.s.HaltEvent);
                 AssertRC(rc);
                 cWoken++;
@@ -1177 +1177 @@
             {
                 ASMAtomicXchgU64(&pCurGVM->gvmm.s.u64HaltExpire, 0);
-                int rc = RTSemEventMultiSignal(pCurGVM->gvmm.s.HaltEventMulti);
+                int rc = RTSemEventSignal(pCurGVM->gvmm.s.HaltEvent);
                 AssertRC(rc);
                 cWoken++;
@@ -1239 +1239 @@
 
         uint32_t cMillies = (u64ExpireGipTime - u64Now) / 1000000;
-        rc = RTSemEventMultiWaitNoResume(pGVM->gvmm.s.HaltEventMulti, cMillies ? cMillies : 1);
+        rc = RTSemEventWaitNoResume(pGVM->gvmm.s.HaltEvent, cMillies ? cMillies : 1);
         ASMAtomicXchgU64(&pGVM->gvmm.s.u64HaltExpire, 0);
         if (rc == VERR_TIMEOUT)
@@ -1252 +1252 @@
         RTSemFastMutexRelease(pGVMM->UsedLock);
     }
-
-    /* Make sure false wake up calls (gvmmR0SchedDoWakeUps) cause us to spin. */
-    RTSemEventMultiReset(pGVM->gvmm.s.HaltEventMulti);
 
     return rc;
@@ -1299 +1296 @@
         }
 
-        int rc2 = RTSemEventMultiSignal(pGVM->gvmm.s.HaltEventMulti);
+        int rc2 = RTSemEventSignal(pGVM->gvmm.s.HaltEvent);
         AssertRC(rc2);
 

trunk/src/VBox/VMM/VMMR0/GVMMR0Internal.h

@@ -40 +40 @@
     uint64_t volatile   u64HaltExpire;
     /** The event semaphore the EMT thread is blocking on. */
-    RTSEMEVENTMULTI     HaltEventMulti;
+    RTSEMEVENT          HaltEvent;
     /** The APIC ID of the CPU that EMT was scheduled on the last time we checked. */
     uint8_t             iCpuEmt;