Changeset 22130 in vbox

Timestamp:

Aug 10, 2009 12:24:35 PM (16 years ago)

Author:

vboxsync

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

50898

Message:

spinlock-r0drv-[solaris|linux].c: More preemption assertions.

Location:

trunk/src/VBox/Runtime/r0drv

Files:

• linux/spinlock-r0drv-linux.c (modified) (5 diffs)
• solaris/spinlock-r0drv-solaris.c (modified) (2 diffs)

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

@@ -35 +35 @@
 #include "the-linux-kernel.h"
 #include "internal/iprt.h"
+#include <iprt/spinlock.h>
 
-#include <iprt/spinlock.h>
-#include <iprt/err.h>
-#include <iprt/alloc.h>
 #include <iprt/assert.h>
 #include <iprt/asm.h>
+#include <iprt/err.h>
+#include <iprt/mem.h>
+#include <iprt/mp.h>
+#include <iprt/thread.h>
 #include "internal/magics.h"
 
@@ -134 +136 @@
 {
     PRTSPINLOCKINTERNAL pSpinlockInt = (PRTSPINLOCKINTERNAL)Spinlock;
+    RT_ASSERT_PREEMPT_CPUID_VAR();
     AssertMsg(pSpinlockInt && pSpinlockInt->u32Magic == RTSPINLOCK_MAGIC,
               ("pSpinlockInt=%p u32Magic=%08x\n", pSpinlockInt, pSpinlockInt ? (int)pSpinlockInt->u32Magic : 0));
@@ -139 +142 @@
 
     spin_lock(&pSpinlockInt->Spinlock);
+
+#ifdef RT_MORE_STRICT
+    {
+        RTCPUID const idAssertCpuNow = RTMpCpuId(); /* Spinlocks are not preemptible, so we cannot be rescheduled. */
+        AssertMsg(idAssertCpu == idAssertCpuNow || idAssertCpu == NIL_RTCPUID,  ("%#x, %#x\n", idAssertCpu, idAssertCpuNow));
+        pTmp->flFlags = idAssertCpuNow;
+    }
+#endif
 }
 RT_EXPORT_SYMBOL(RTSpinlockAcquire);
@@ -146 +157 @@
 {
     PRTSPINLOCKINTERNAL pSpinlockInt = (PRTSPINLOCKINTERNAL)Spinlock;
+#ifdef RT_MORE_STRICT
+    RTCPUID const idAssertCpu = pTmp->flFlags;
+    pTmp->flFlags = 0;
+    RT_ASSERT_PREEMPT_CPUID();
+#endif
     AssertMsg(pSpinlockInt && pSpinlockInt->u32Magic == RTSPINLOCK_MAGIC,
               ("pSpinlockInt=%p u32Magic=%08x\n", pSpinlockInt, pSpinlockInt ? (int)pSpinlockInt->u32Magic : 0));
@@ -151 +167 @@
 
     spin_unlock(&pSpinlockInt->Spinlock);
+
+#ifdef RT_MORE_STRICT
+    if (!RTThreadPreemptIsEnabled(NIL_RTTHREAD))
+        RT_ASSERT_PREEMPT_CPUID();
+#endif
 }
 RT_EXPORT_SYMBOL(RTSpinlockRelease);

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

@@ -141 +141 @@
 
     mutex_enter(&pSpinlockInt->Mtx);
-    RT_ASSERT_PREEMPT_CPUID();
+
 #ifdef RT_MORE_STRICT
-    /* Spinlocks are not preemptible, so we cannot be rescheduled. */
-    pTmp->uFlags = idAssertCpu != NIL_RTCPUID ? idAssertCpu : RTMpCpuId();
+    {
+        RTCPUID const idAssertCpuNow = RTMpCpuId(); /* Spinlocks are not preemptible, so we cannot be rescheduled. */
+        AssertMsg(idAssertCpu == idAssertCpuNow || idAssertCpu == NIL_RTCPUID,  ("%#x, %#x\n", idAssertCpu, idAssertCpuNow));
+        pTmp->uFlags = idAssertCpuNow;
+    }
 #endif
 }
@@ -155 +158 @@
     RTCPUID const idAssertCpu = pTmp->uFlags;
     pTmp->uFlags = 0;
+    RT_ASSERT_PREEMPT_CPUID();
 #endif
     AssertPtr(pSpinlockInt);
     Assert(pSpinlockInt->u32Magic == RTSPINLOCK_MAGIC);
-    RT_ASSERT_PREEMPT_CPUID();
     NOREF(pTmp);
 
     mutex_exit(&pSpinlockInt->Mtx);
+
+#ifdef RT_MORE_STRICT
+    if (!RTThreadPreemptIsEnabled(NIL_RTTHREAD))
+        RT_ASSERT_PREEMPT_CPUID();
+#endif
 }