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

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.

File:

• trunk/src/VBox/Runtime/r0drv/os2/thread-r0drv-os2.cpp (modified) (4 diffs)

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

@@ -35 +35 @@
 
 #include <iprt/thread.h>
+#include <iprt/asm.h>
+#include <iprt/assert.h>
 #include <iprt/err.h>
-#include <iprt/assert.h>
 #include "internal/thread.h"
+
+
+/*******************************************************************************
+*   Global Variables                                                           *
+*******************************************************************************/
+/** Per-cpu preemption counters. */
+static int32_t volatile g_acPreemptDisabled[256];
+
 
 
@@ -78 +87 @@
 {
     Assert(hThread == NIL_RTTHREAD);
-    return false;
-}
-
-
-RTDECL(bool) RTThreadPreemptIsPendingTrusty(void)
-{
-    /* yes, RTThreadPreemptIsPending is reliable. */
-    return true;
+    int32_t c = g_acPreemptDisabled[ASMGetApicId()];
+    AssertMsg(c >= 0 && c < 32, ("%d\n", c));
+    return c == 0
+        && ASMIntAreEnabled();
 }
 
@@ -112 +117 @@
 
 
+RTDECL(bool) RTThreadPreemptIsPendingTrusty(void)
+{
+    /* yes, RTThreadPreemptIsPending is reliable. */
+    return true;
+}
+
+
+RTDECL(bool) RTThreadPreemptIsPossible(void)
+{
+    /* no kernel preemption on OS/2. */
+    return false;
+}
+
+
 RTDECL(void) RTThreadPreemptDisable(PRTTHREADPREEMPTSTATE pState)
 {
     AssertPtr(pState);
-    Assert(pState->uchDummy != 42);
-    pState->uchDummy = 42;
-    /* Nothing to do here as OS/2 doesn't preempt kernel threads. */
+
+    /* No preemption on OS/2, so do our own accounting. */
+    int32_t c = ASMAtomicIncS32(&g_acPreemptDisabled[ASMGetApicId()]);
+    AssertMsg(c > 0 && c < 32, ("%d\n", c));
+    pState->uchDummy = (unsigned char)c;
 }
 
@@ -124 +145 @@
 {
     AssertPtr(pState);
-    Assert(pState->uchDummy == 42);
+    AssertMsg(pState->uchDummy > 0 && pState->uchDummy < 32, ("%d\n", pState->uchDummy));
+
+    /* No preemption on OS/2, so do our own accounting. */
+    int32_t volatile *pc = &g_acPreemptDisabled[ASMGetApicId()];
+    AssertMsg(pState->uchDummy == (uint32_t)*pc, ("uchDummy=%d *pc=%d \n", pState->uchDummy, *pc));
+    ASMAtomicUoWriteS32(pc, pState->uchDummy - 1);
     pState->uchDummy = 0;
 }
 
+
+RTDECL(bool) RTThreadIsInInterrupt(RTTHREAD hThread)
+{
+    Assert(hThread == NIL_RTTHREAD); NOREF(hThread);
+
+    union
+    {
+        RTFAR16 fp;
+        uint8_t cInterruptLevel;
+    } u;
+    /** @todo OS/2: verify the usage of DHGETDOSV_INTERRUPTLEV. */
+    int rc = RTR0Os2DHQueryDOSVar(DHGETDOSV_INTERRUPTLEV, 0, &u.fp);
+    AssertReturn(rc == 0, true);
+
+    return cInterruptLevel > 0;
+}
+