Changeset 22773 in vbox

Timestamp:

Sep 4, 2009 10:14:17 AM (15 years ago)

Author:

vboxsync

Message:

semevent-r0drv-solaris.c, semeventmulti-r0drv-solaris.c: Added preemption note and applied the workaround to RTSemEventMultiReset as well just to be on the safe side.

Location:

trunk/src/VBox/Runtime/r0drv/solaris

Files:

• semevent-r0drv-solaris.c (modified) (1 diff)
• semeventmulti-r0drv-solaris.c (modified) (2 diffs)

trunk/src/VBox/Runtime/r0drv/solaris/semevent-r0drv-solaris.c

@@ -142 +142 @@
      * If we're in interrupt context we need to unpin the underlying current
      * thread as this could lead to a deadlock (see #4259 for the full explanation)
+     *
+     * Note! This assumes nobody is using the RTThreadPreemptDisable in an
+     *       interrupt context and expects it to work right.  The swtch will
+     *       result in a voluntary preemption.  To fix this, we would have to
+     *       do our own counting in RTThreadPreemptDisable/Restore like we do
+     *       on systems which doesn't do preemption (OS/2, linux, ...) and
+     *       check whether preemption was disabled via RTThreadPreemptDisable
+     *       or not and only call swtch if RTThreadPreemptDisable wasn't called.
      */
     int fAcquired = mutex_tryenter(&pEventInt->Mtx);

trunk/src/VBox/Runtime/r0drv/solaris/semeventmulti-r0drv-solaris.c

@@ -141 +141 @@
      * If we're in interrupt context we need to unpin the underlying current
      * thread as this could lead to a deadlock (see #4259 for the full explanation)
+     *
+     * Note! See remarks about preemption in RTSemEventSignal.
      */
     int fAcquired = mutex_tryenter(&pThis->Mtx);
@@ -177 +179 @@
     RT_ASSERT_INTS_ON();
 
-    mutex_enter(&pThis->Mtx);
+    /*
+     * If we're in interrupt context we need to unpin the underlying current
+     * thread as this could lead to a deadlock (see #4259 for the full explanation)
+     *
+     * Note! See remarks about preemption in RTSemEventSignal.
+     */
+    int fAcquired = mutex_tryenter(&pThis->Mtx);
+    if (!fAcquired)
+    {
+        if (curthread->t_intr && getpil() < DISP_LEVEL)
+            swtch();
+
+        mutex_enter(&pThis->Mtx);
+    }
+
     ASMAtomicXchgU8(&pThis->fSignaled, false);
     mutex_exit(&pThis->Mtx);