Changeset 22991 in vbox

Timestamp:

Sep 14, 2009 10:16:08 AM (15 years ago)

Author:

vboxsync

Message:

Solaris/sem-r0drv: fix for #4259 host deadlock.

Location:

trunk/src/VBox/Runtime/r0drv/solaris

Files:

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

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

@@ -155 +155 @@
     {
         if (curthread->t_intr && getpil() < DISP_LEVEL)
-            swtch();
-
+        {
+            RTTHREADPREEMPTSTATE PreemptState = RTTHREADPREEMPTSTATE_INITIALIZER;
+            RTThreadPreemptDisable(&PreemptState);
+            preempt();
+            RTThreadPreemptRestore(&PreemptState);
+        }
         mutex_enter(&pEventInt->Mtx);
     }

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

@@ -148 +148 @@
     {
         if (curthread->t_intr && getpil() < DISP_LEVEL)
-            swtch();
-
+        {
+            RTTHREADPREEMPTSTATE PreemptState = RTTHREADPREEMPTSTATE_INITIALIZER;
+            RTThreadPreemptDisable(&PreemptState);
+            preempt();
+            RTThreadPreemptRestore(&PreemptState);
+        }
         mutex_enter(&pThis->Mtx);
     }
@@ -189 +193 @@
     {
         if (curthread->t_intr && getpil() < DISP_LEVEL)
-            swtch();
-
+        {
+            RTTHREADPREEMPTSTATE PreemptState = RTTHREADPREEMPTSTATE_INITIALIZER;
+            RTThreadPreemptDisable(&PreemptState);
+            preempt();
+            RTThreadPreemptRestore(&PreemptState);
+        }
         mutex_enter(&pThis->Mtx);
     }

trunk/src/VBox/Runtime/r0drv/solaris/the-solaris-kernel.h

@@ -49 +49 @@
 #include <sys/class.h>
 #include <sys/cpuvar.h>
+#include <sys/archsystm.h>
 #include <sys/x_call.h> /* in platform dir */
 #include <sys/x86_archext.h>