Changeset 28702 in vbox for trunk/src/VBox/Runtime/r0drv/linux/spinlock-r0drv-linux.c

Timestamp:

Apr 25, 2010 12:36:09 AM (15 years ago)

Author:

vboxsync

Message:

spinlock-r0drv-linux.c: Added checks for consistent NoIrq usage.

File:

• trunk/src/VBox/Runtime/r0drv/linux/spinlock-r0drv-linux.c (modified) (7 diffs)

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2007 Sun Microsystems, Inc.
+ * Copyright (C) 2006-2010 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -68 +68 @@
     void                *pvUniDummy;
 #endif
+#ifdef RT_STRICT
+    /** Set if we've seen any fNoIrqs usage.
+     * This must be consistent or it won't work you know. */
+    bool                fNoIrqs;
+#endif
 } RTSPINLOCKINTERNAL, *PRTSPINLOCKINTERNAL;
 
@@ -89 +94 @@
     pThis->idCpuOwner  = NIL_RTCPUID;
     pThis->idAssertCpu = NIL_RTCPUID;
+#endif
+#ifdef RT_STRICT
+    pThis->fNoIrqs     = false;
 #endif
     spin_lock_init(&pThis->Spinlock);
@@ -129 +137 @@
 
     RT_ASSERT_PREEMPT_CPUID_SPIN_ACQUIRED(pThis);
+#ifdef RT_STRICT
+    pThis->fNoIrqs = true;
+#endif
 }
 RT_EXPORT_SYMBOL(RTSpinlockAcquireNoInts);
@@ -141 +152 @@
               ("pThis=%p u32Magic=%08x\n", pThis, pThis ? (int)pThis->u32Magic : 0));
     RT_ASSERT_PREEMPT_CPUID_SPIN_RELEASE(pThis);
-    NOREF(pTmp);
+    Assert(pThis->fNoIrqs);
 
     spin_unlock_irqrestore(&pThis->Spinlock, pTmp->flFlags);
@@ -157 +168 @@
               ("pThis=%p u32Magic=%08x\n", pThis, pThis ? (int)pThis->u32Magic : 0));
     NOREF(pTmp);
+    Assert(!pThis->fNoIrqs || !ASMIntAreEnabled());
 
     spin_lock(&pThis->Spinlock);
@@ -173 +185 @@
     NOREF(pTmp);
     RT_ASSERT_PREEMPT_CPUID_SPIN_RELEASE(pThis);
+    Assert(!pThis->fNoIrqs || !ASMIntAreEnabled());
 
     spin_unlock(&pThis->Spinlock);