Changeset 22150 in vbox for trunk/src/VBox/Runtime

Timestamp:

Aug 11, 2009 9:41:58 AM (16 years ago)

Author:

vboxsync

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

50921

Message:

IPRT,SUPDrv: Changed RTTHREADPREEMPTSTATE breaking binary compatibility - increased the major SUPDrv version.

Location:

trunk/src/VBox/Runtime

Files:

• include/internal/iprt.h (modified) (1 diff)
• r0drv/darwin/threadpreempt-r0drv-darwin.cpp (modified) (3 diffs)
• r0drv/freebsd/thread-r0drv-freebsd.c (modified) (2 diffs)
• r0drv/generic/RTThreadPreemptDisable-r0drv-generic.cpp (modified) (1 diff)
• r0drv/generic/RTThreadPreemptRestore-r0drv-generic.cpp (modified) (1 diff)
• r0drv/linux/thread-r0drv-linux.c (modified) (4 diffs)
• r0drv/nt/thread-r0drv-nt.cpp (modified) (2 diffs)
• r0drv/os2/thread-r0drv-os2.cpp (modified) (2 diffs)
• r0drv/solaris/thread-r0drv-solaris.c (modified) (2 diffs)
• r0drv/solaris/vbi/thread-r0drv-solaris.c (modified) (3 diffs)

trunk/src/VBox/Runtime/include/internal/iprt.h

@@ -131 +131 @@
 #endif
 
+/** @def RT_ASSERT_PREEMPT_CPUID_DISABLE
+ * For use in RTThreadPreemptDisable implementations after having disabled
+ * preemption.  Requires iprt/mp.h. */
+#ifdef RT_MORE_STRICT
+# define RT_ASSERT_PREEMPT_CPUID_DISABLE(pStat) \
+    do \
+    { \
+        Assert((pStat)->idCpu == NIL_RTCPUID); \
+        (pStat)->idCpu = RTMpCpuId(); \
+    } while (0)
+#else
+# define RT_ASSERT_PREEMPT_CPUID_DISABLE(pStat) \
+    Assert((pStat)->idCpu == NIL_RTCPUID)
+#endif
+
+/** @def RT_ASSERT_PREEMPT_CPUID_RESTORE
+ * For use in RTThreadPreemptRestore implementations before restoring
+ * preemption.  Requires iprt/mp.h. */
+#ifdef RT_MORE_STRICT
+# define RT_ASSERT_PREEMPT_CPUID_RESTORE(pStat) \
+    do \
+    { \
+        RTCPUID const idAssertCpuNow = RTMpCpuId(); \
+        AssertMsg((pStat)->idCpu == idAssertCpuNow,  ("%#x, %#x\n", (pStat)->idCpu, idAssertCpuNow)); \
+        (pStat)->idCpu = NIL_RTCPUID; \
+    } while (0)
+#else
+# define RT_ASSERT_PREEMPT_CPUID_RESTORE(pStat)         do { } while (0)
+#endif
+
+
 /** @def RT_ASSERT_INTS_ON
  * Asserts that interrupts are disabled when RT_MORE_STRICT is defined.   */

trunk/src/VBox/Runtime/r0drv/darwin/threadpreempt-r0drv-darwin.cpp

@@ -141 +141 @@
 {
     AssertPtr(pState);
-    Assert(pState->uchDummy != 42);
-    pState->uchDummy = 42;
+    Assert(pState->u32Reserved == 0);
+    pState->u32Reserved = 42;
 
     /*
@@ -164 +164 @@
     ASMSetFlags(fSavedFlags);
     Assert(!RTThreadPreemptIsEnabled(NIL_RTTHREAD));
+    RT_ASSERT_PREEMPT_CPUID_DISABLE(pState);
 }
 
@@ -170 +171 @@
 {
     AssertPtr(pState);
-    Assert(pState->uchDummy == 42);
-    pState->uchDummy = 0;
+    Assert(pState->u32Reserved == 42);
+    pState->u32Reserved = 0;
+    RT_ASSERT_PREEMPT_CPUID_RESTORE(pState);
 
     RTCPUID idCpu = RTMpCpuId();

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

@@ -143 +143 @@
 {
     AssertPtr(pState);
-    Assert(pState->uchDummy != 42);
-    pState->uchDummy = 42;
+    Assert(pState->u32Reserved == 0);
+    pState->u32Reserved = 42;
 
     critical_enter();
+    RT_ASSERT_PREEMPT_CPUID_DISABLE(pState);
 }
 
@@ -153 +154 @@
 {
     AssertPtr(pState);
-    Assert(pState->uchDummy == 42);
-    pState->uchDummy = 0;
+    Assert(pState->u32Reserved == 42);
+    pState->u32Reserved = 0;
 
+    RT_ASSERT_PREEMPT_CPUID_RESTORE(pState);
     critical_exit();
 }

trunk/src/VBox/Runtime/r0drv/generic/RTThreadPreemptDisable-r0drv-generic.cpp

@@ -42 +42 @@
 {
     AssertPtr(pState);
-    Assert(pState->uchDummy != 42);
-    pState->uchDummy = 42;
+    Assert(pState->u32Reserved == 0);
+    pState->u32Reserved = 42;
 }
 RT_EXPORT_SYMBOL(RTThreadPreemptDisable);

trunk/src/VBox/Runtime/r0drv/generic/RTThreadPreemptRestore-r0drv-generic.cpp

@@ -42 +42 @@
 {
     AssertPtr(pState);
-    Assert(pState->uchDummy == 42);
-    pState->uchDummy = 0;
+    Assert(pState->u32Reserved == 42);
+    pState->u32Reserved = 0;
 }
 RT_EXPORT_SYMBOL(RTThreadPreemptRestore);

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

@@ -35 +35 @@
 #include "the-linux-kernel.h"
 #include "internal/iprt.h"
-
 #include <iprt/thread.h>
+
 #include <iprt/asm.h>
 #include <iprt/assert.h>
 #include <iprt/err.h>
+#include <iprt/mp.h>
 
 
@@ -160 +161 @@
 #ifdef CONFIG_PREEMPT
     AssertPtr(pState);
-    Assert(pState->uchDummy != 42);
-    pState->uchDummy = 42;
+    Assert(pState->u32Reserved == 0);
+    pState->u32Reserved = 42;
     preempt_disable();
+    RT_ASSERT_PREEMPT_CPUID_DISABLE(pState);
 
 #else /* !CONFIG_PREEMPT */
     int32_t c;
     AssertPtr(pState);
+    Assert(pState->u32Reserved == 0);
 
     /* Do our own accounting. */
     c = ASMAtomicIncS32(&g_acPreemptDisabled[smp_processor_id()]);
     AssertMsg(c > 0 && c < 32, ("%d\n", c));
-    pState->uchDummy = (unsigned char )c;
+    pState->u32Reserved = c;
+    RT_ASSERT_PREEMPT_CPUID_DISABLE(pState);
 #endif
 }
@@ -181 +185 @@
 #ifdef CONFIG_PREEMPT
     AssertPtr(pState);
-    Assert(pState->uchDummy == 42);
-    pState->uchDummy = 0;
+    Assert(pState->u32Reserved == 42);
+    RT_ASSERT_PREEMPT_CPUID_RESTORE(pState);
     preempt_enable();
 
@@ -188 +192 @@
     int32_t volatile *pc;
     AssertPtr(pState);
-    AssertMsg(pState->uchDummy > 0 && pState->uchDummy < 32, ("%d\n", pState->uchDummy));
+    AssertMsg(pState->u32Reserved > 0 && pState->u32Reserved < 32, ("%d\n", pState->u32Reserved));
+    RT_ASSERT_PREEMPT_CPUID_RESTORE(pState);
 
     /* Do our own accounting. */
     pc = &g_acPreemptDisabled[smp_processor_id()];
-    AssertMsg(pState->uchDummy == (uint32_t)*pc, ("uchDummy=%d *pc=%d \n", pState->uchDummy, *pc));
-    ASMAtomicUoWriteS32(pc, pState->uchDummy - 1);
-#endif
+    AssertMsg(pState->u32Reserved == (uint32_t)*pc, ("u32Reserved=%d *pc=%d \n", pState->u32Reserved, *pc));
+    ASMAtomicUoWriteS32(pc, pState->u32Reserved - 1);
+#endif
+    pState->u32Reserved = 0;
 }
 RT_EXPORT_SYMBOL(RTThreadPreemptRestore);

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

@@ -169 +169 @@
 
     KeRaiseIrql(DISPATCH_LEVEL, &pState->uchOldIrql);
+    RT_ASSERT_PREEMPT_CPUID_DISABLE(pState);
 }
 
@@ -176 +177 @@
     AssertPtr(pState);
 
+    RT_ASSERT_PREEMPT_CPUID_RESTORE(pState);
     KeLowerIrql(pState->uchOldIrql);
     pState->uchOldIrql = 255;

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

@@ -134 +134 @@
 {
     AssertPtr(pState);
+    Assert(pState->u32Reserved == 0);
 
     /* 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;
+    pState->u32Reserved = c;
+    RT_ASSERT_PREEMPT_CPUID_DISABLE(pState);
 }
 
@@ -145 +147 @@
 {
     AssertPtr(pState);
-    AssertMsg(pState->uchDummy > 0 && pState->uchDummy < 32, ("%d\n", pState->uchDummy));
+    AssertMsg(pState->u32Reserved > 0 && pState->u32Reserved < 32, ("%d\n", pState->u32Reserved));
+    RT_ASSERT_PREEMPT_CPUID_RESTORE(pState);
 
     /* 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;
+    AssertMsg(pState->u32Reserved == (uint32_t)*pc, ("uchDummy=%d *pc=%d \n", pState->u32Reserved, *pc));
+    ASMAtomicUoWriteS32(pc, pState->u32Reserved - 1);
+    pState->u32Reserved = 0;
 }
 

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

@@ -142 +142 @@
 {
     AssertPtr(pState);
-    Assert(pState->uchDummy != 42);
-    pState->uchDummy = 42;
+    Assert(pState->u32Reserved == 0);
+    pState->u32Reserved = 42;
 
     kpreempt_disable();
+    RT_ASSERT_PREEMPT_CPUID_DISABLE(pState);
 }
 
@@ -152 +153 @@
 {
     AssertPtr(pState);
-    Assert(pState->uchDummy == 42);
-    pState->uchDummy = 0;
+    Assert(pState->u32Reserved == 42);
+    pState->u32Reserved = 0;
+    RT_ASSERT_PREEMPT_CPUID_RESTORE(pState);
 
     kpreempt_enable();

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

@@ -40 +40 @@
 #include <iprt/assert.h>
 #include <iprt/err.h>
+#include <iprt/mp.h>
 
 
@@ -138 +139 @@
 {
     AssertPtr(pState);
-    Assert(pState->uchDummy != 42);
-    pState->uchDummy = 42;
+    Assert(pState->u32Reserved == 0);
+    pState->u32Reserved = 42;
     vbi_preempt_disable();
+    RT_ASSERT_PREEMPT_CPUID_DISABLE(pState);
 }
 
@@ -147 +149 @@
 {
     AssertPtr(pState);
-    Assert(pState->uchDummy == 42);
-    pState->uchDummy = 0;
+    Assert(pState->u32Reserved == 42);
+    pState->u32Reserved = 0;
+    RT_ASSERT_PREEMPT_CPUID_RESTORE(pState);
     vbi_preempt_enable();
 }