Changeset 21536 in vbox for trunk/src/VBox/Runtime/r0drv/solaris

Timestamp:

Jul 13, 2009 2:49:39 PM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

50009

Message:

iprt/thread.h: Redefined RTThreadPreemptIsEnabled for systems without preemption (we keep count ourselves). Added RTThreadPreemptIsPossible and RTThreadIsInInterrupt. Fixed RTThreadPreemptIsEnabled on FreeBSD and Solaris/vbi.

Location:

trunk/src/VBox/Runtime/r0drv/solaris

Files:

• thread-r0drv-solaris.c (modified) (5 diffs)
• vbi/thread-r0drv-solaris.c (modified) (6 diffs)

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

@@ -29 +29 @@
  */
 
+
 /*******************************************************************************
 *   Header Files                                                               *
@@ -35 +36 @@
 
 #include <iprt/thread.h>
-#include <iprt/err.h>
 #include <iprt/asm.h>
 #include <iprt/assert.h>
+#include <iprt/err.h>
 
 
@@ -105 +106 @@
     if (curthread->t_preempt != 0)
         return false;
-#if defined(RT_ARCH_X86) || defined(RT_ARCH_AMD64)
-    if (!(ASMGetFlags() & 0x00000200 /* X86_EFL_IF */))
+    if (!ASMIntAreEnabled())
         return false;
-#endif
     return true;
 }
@@ -125 +124 @@
 {
     /* yes, RTThreadPreemptIsPending is reliable. */
+    return true;
+}
+
+
+RTDECL(bool) RTThreadPreemptIsPossible(void)
+{
+    /* yes, kernel preemption is possible. */
     return true;
 }
@@ -148 +154 @@
 }
 
+
+RTDECL(bool) RTThreadIsInInterrupt(RTTHREAD hThread)
+{
+    Assert(hThread == NIL_RTTHREAD); NOREF(hThread);
+    /** @todo Solaris: Implement RTThreadIsInInterrupt. Required for guest
+     *        additions! */
+    return !ASMIntAreEnabled();
+}
+

trunk/src/VBox/Runtime/r0drv/solaris/vbi/thread-r0drv-solaris.c

@@ -29 +29 @@
  */
 
+
 /*******************************************************************************
 *   Header Files                                                               *
@@ -35 +36 @@
 
 #include <iprt/thread.h>
+#include <iprt/asm.h>
+#include <iprt/assert.h>
 #include <iprt/err.h>
-#include <iprt/assert.h>
+
 
 RTDECL(RTNATIVETHREAD) RTThreadNativeSelf(void)
@@ -100 +103 @@
 {
     Assert(hThread == NIL_RTTHREAD);
-    return vbi_is_preempt_enabled() != 0;
+    if (    vbi_is_preempt_enabled()
+        &&  ASMIntAreEnabled())
+        return true;
+    return false;
 }
 
@@ -107 +113 @@
 {
     Assert(hThread == NIL_RTTHREAD);
-    /** @todo Review this! */
     return !!vbi_is_preempt_pending();
 }
@@ -115 +120 @@
 {
     /* yes, RTThreadPreemptIsPending is reliable. */
+    return true;
+}
+
+
+RTDECL(bool) RTThreadPreemptIsPossible(void)
+{
+    /* yes, kernel preemption is possible. */
     return true;
 }
@@ -136 +148 @@
 }
 
+
+RTDECL(bool) RTThreadIsInInterrupt(RTTHREAD hThread)
+{
+    Assert(hThread == NIL_RTTHREAD); NOREF(hThread);
+    /** @todo Solaris: Implement RTThreadIsInInterrupt. Required for guest
+     *        additions! */
+    return !ASMIntAreEnabled();
+}
+