Changeset 51571 in vbox

Timestamp:

Jun 7, 2014 2:28:43 AM (11 years ago)

Author:

vboxsync

Message:

Runtime/generic: Explicitly prevent mixing ring-3 and ring-0 spinlock implementations.

Location:

trunk/src/VBox/Runtime

Files:

• generic/spinlock-generic.cpp (modified) (5 diffs)
• include/internal/magics.h (modified) (1 diff)

trunk/src/VBox/Runtime/generic/spinlock-generic.cpp

@@ -63 +63 @@
 typedef struct RTSPINLOCKINTERNAL
 {
-    /** Spinlock magic value (RTSPINLOCK_MAGIC). */
+    /** Spinlock magic value (RTSPINLOCK_GEN_MAGIC). */
     uint32_t            u32Magic;
     /** The spinlock creation flags. */
@@ -89 +89 @@
      * Initialize and return.
      */
-    pThis->u32Magic  = RTSPINLOCK_MAGIC;
+    pThis->u32Magic  = RTSPINLOCK_GEN_MAGIC;
     pThis->fFlags    = fFlags;
     pThis->fIntSaved = 0;
@@ -108 +108 @@
     if (!pThis)
         return VERR_INVALID_PARAMETER;
-    if (pThis->u32Magic != RTSPINLOCK_MAGIC)
+    if (pThis->u32Magic != RTSPINLOCK_GEN_MAGIC)
     {
         AssertMsgFailed(("Invalid spinlock %p magic=%#x\n", pThis, pThis->u32Magic));
@@ -124 +124 @@
 {
     PRTSPINLOCKINTERNAL pThis = (PRTSPINLOCKINTERNAL)Spinlock;
-    AssertMsg(pThis && pThis->u32Magic == RTSPINLOCK_MAGIC,
+    AssertMsg(pThis && pThis->u32Magic == RTSPINLOCK_GEN_MAGIC,
               ("pThis=%p u32Magic=%08x\n", pThis, pThis ? (int)pThis->u32Magic : 0));
 
@@ -200 +200 @@
 {
     PRTSPINLOCKINTERNAL pThis = (PRTSPINLOCKINTERNAL)Spinlock;
-    AssertMsg(pThis && pThis->u32Magic == RTSPINLOCK_MAGIC,
+    AssertMsg(pThis && pThis->u32Magic == RTSPINLOCK_GEN_MAGIC,
               ("pThis=%p u32Magic=%08x\n", pThis, pThis ? (int)pThis->u32Magic : 0));
 

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

@@ -171 +171 @@
 /** Magic value for RTSPINLOCKINTERNAL::u32Magic. (Terry Pratchett) */
 #define RTSPINLOCK_MAGIC                UINT32_C(0x19480428)
+/** Magic value for generic RTSPINLOCKINTERNAL::u32Magic (Georges Prosper Remi). */
+#define RTSPINLOCK_GEN_MAGIC            UINT32_C(0x10970522)
 /** Magic value for RTSTRCACHE::u32Magic. (Sir Arthur Charles Clarke) */
 #define RTSTRCACHE_MAGIC                UINT32_C(0x19171216)