Changeset 13262 in vbox

Timestamp:

Oct 14, 2008 1:09:04 PM (16 years ago)

Author:

vboxsync

Message:

iprt: RTThreadPreemptIsEanbled - check the interrupt flags too.

Location:

trunk/src/VBox/Runtime/r0drv

Files:

• nt/thread-r0drv-nt.cpp (modified) (2 diffs)
• solaris/thread-r0drv-solaris.c (modified) (2 diffs)

trunk/src/VBox/Runtime/r0drv/nt/thread-r0drv-nt.cpp

@@ -36 +36 @@
 #include <iprt/thread.h>
 #include <iprt/err.h>
+#include <iprt/assert.h>
+#include <iprt/asm.h>
 
 __BEGIN_DECLS
@@ -76 +78 @@
     Assert(hThread == NIL_RTTHREAD);
     KIRQL Irql = KeGetCurrentIrql();
-    return Irql <= APC_LEVEL;
+    if (Irql > APC_LEVEL)
+        return false;
+#if defined(RT_ARCH_X86) || defined(RT_ARCH_AMD64)
+    if (!(ASMGetFlags() & 0x00000200 /* X86_EFL_IF */))
+        return false;
+#endif
+    return true;
 }
 

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

@@ -36 +36 @@
 #include <iprt/thread.h>
 #include <iprt/err.h>
+#include <iprt/asm.h>
 #include <iprt/assert.h>
 
@@ -102 +103 @@
 {
     Assert(hThread == NIL_RTTHREAD);
-    return curthread->t_preempt == 0;
+    if (curthread->t_preempt != 0)
+        return false;
+#if defined(RT_ARCH_X86) || defined(RT_ARCH_AMD64)
+    if (!(ASMGetFlags() & 0x00000200 /* X86_EFL_IF */))
+        return false;
+#endif
+    return true;
 }