Changeset 22128 in vbox

Timestamp:

Aug 10, 2009 11:56:08 AM (15 years ago)

Author:

vboxsync

Message:

VBoxGuest.cpp: RTSpinlockAcquireNoInts vs RTSemEventMultiSignal on solaris.

File:

• trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest.cpp (modified) (6 diffs)

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest.cpp

@@ -19 +19 @@
  * additional information or have any questions.
  */
-
 
 
@@ -930 +929 @@
 static int VBoxGuestCommonIOCtl_CancelAllWaitEvents(PVBOXGUESTDEVEXT pDevExt, PVBOXGUESTSESSION pSession)
 {
-    RTSPINLOCKTMP   Tmp = RTSPINLOCKTMP_INITIALIZER;
-    PVBOXGUESTWAIT  pWait;
-    int             rc = 0;
+    RTSPINLOCKTMP           Tmp   = RTSPINLOCKTMP_INITIALIZER;
+#if defined(RT_OS_SOLARIS)
+    RTTHREADPREEMPTSTATE    State = RTTHREADPREEMPTSTATE_INITIALIZER;
+#endif
+    PVBOXGUESTWAIT          pWait;
+    int                     rc = 0;
 
     Log(("VBoxGuestCommonIOCtl: CANCEL_ALL_WAITEVENTS\n"));
@@ -938 +940 @@
     /*
      * Walk the event list and wake up anyone with a matching session.
-     */
+     *
+     * Note! On Solaris we have to do really ugly stuff here because
+     *       RTSemEventMultiSignal cannot be called with interrupts disabled.
+     *       The hack is racy, but what we can we do... (Eliminate this
+     *       termination hack, perhaps?)
+     */
+#if defined(RT_OS_SOLARIS)
+    RTThreadPreemptDisable(&State);
+    RTSpinlockAcquireNoInts(pDevExt->EventSpinlock, &Tmp);
+    do
+    {
+        for (pWait = pDevExt->WaitList.pHead; pWait; pWait = pWait->pNext)
+            if (    pWait->pSession   == pSession
+                &&  pWait->fResEvents != UINT32_MAX)
+            {
+                RTSEMEVENTMULTI     hEvent;
+                pWait->fResEvents = UINT32_MAX;
+                RTSpinlockReleaseNoInts(pDevExt->EventSpinlock, &Tmp);
+                /* HACK ALRET! This races wakeup + reuse! */
+                rc |= RTSemEventMultiSignal(hEvent);
+                RTSpinlockAcquireNoInts(pDevExt->EventSpinlock, &Tmp);
+                break;
+            }
+    } while (pWait);
+    RTSpinlockReleaseNoInts(pDevExt->EventSpinlock, &Tmp);
+    RTThreadPreemptDisable(&State);
+#else
     RTSpinlockAcquireNoInts(pDevExt->EventSpinlock, &Tmp);
     for (pWait = pDevExt->WaitList.pHead; pWait; pWait = pWait->pNext)
@@ -947 +975 @@
         }
     RTSpinlockReleaseNoInts(pDevExt->EventSpinlock, &Tmp);
+#endif
     Assert(rc == 0);
 
@@ -1629 +1658 @@
     /*
      * Enter the spinlock and check if it's our IRQ or not.
-     */
+     *
+     * Note! Solaris cannot do RTSemEventMultiSignal with interrupts disabled
+     *       so we're entering the spinlock without disabling them.  This works
+     *       fine as long as we never called in a nested fashion.
+     */
+#if defined(RT_OS_SOLARIS)
+    RTSpinlockAcquire(pDevExt->EventSpinlock, &Tmp);
+#else
     RTSpinlockAcquireNoInts(pDevExt->EventSpinlock, &Tmp);
+#endif
     fOurIrq = pDevExt->pVMMDevMemory->V.V1_04.fHaveEvents;
     if (fOurIrq)
@@ -1703 +1740 @@
      * Do this outside the spinlock to prevent some recursive spinlocking.
      */
+#if defined(RT_OS_SOLARIS)
+    RTSpinlockRelease(pDevExt->EventSpinlock, &Tmp);
+#else
     RTSpinlockReleaseNoInts(pDevExt->EventSpinlock, &Tmp);
+#endif
 
     if (fMousePositionChanged)