Changeset 22129 in vbox

Timestamp:

Aug 10, 2009 12:12:17 PM (15 years ago)

Author:

vboxsync

Message:

spinlock-r0drv-solaris.c: More preemption assertions.

File:

• trunk/src/VBox/Runtime/r0drv/solaris/spinlock-r0drv-solaris.c (modified) (5 diffs)

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

@@ -41 +41 @@
 #include <iprt/err.h>
 #include <iprt/mem.h>
+#include <iprt/mp.h>
 #include <iprt/thread.h>
 #include "internal/magics.h"
@@ -112 +113 @@
 
     pTmp->uFlags = ASMIntDisableFlags();
-    mutex_enter(&pSpinlockInt->Mtx);
+    {
+        RT_ASSERT_PREEMPT_CPUID_VAR();
+        mutex_enter(&pSpinlockInt->Mtx);
+        RT_ASSERT_PREEMPT_CPUID();
+    }
 }
 
@@ -130 +135 @@
 {
     PRTSPINLOCKINTERNAL pSpinlockInt = (PRTSPINLOCKINTERNAL)Spinlock;
+    RT_ASSERT_PREEMPT_CPUID_VAR();
     AssertPtr(pSpinlockInt);
     Assert(pSpinlockInt->u32Magic == RTSPINLOCK_MAGIC);
@@ -135 +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();
+#endif
 }
 
@@ -141 +152 @@
 {
     PRTSPINLOCKINTERNAL pSpinlockInt = (PRTSPINLOCKINTERNAL)Spinlock;
+#ifdef RT_MORE_STRICT
+    RTCPUID const idAssertCpu = pTmp->uFlags;
+    pTmp->uFlags = 0;
+#endif
     AssertPtr(pSpinlockInt);
     Assert(pSpinlockInt->u32Magic == RTSPINLOCK_MAGIC);
+    RT_ASSERT_PREEMPT_CPUID();
     NOREF(pTmp);