Changeset 20755 in vbox

Timestamp:

Jun 21, 2009 11:41:32 PM (15 years ago)

Author:

vboxsync

Message:

PDMAllCritSect: try some serious paranoia and see if it makes any changes for #3992 (it should not, if it does, then we are in trouble in IPRT).

File:

• trunk/src/VBox/VMM/VMMAll/PDMAllCritSect.cpp (modified) (7 diffs)

trunk/src/VBox/VMM/VMMAll/PDMAllCritSect.cpp

@@ -92 +92 @@
     Assert(!(pCritSect->s.Core.fFlags & PDMCRITSECT_FLAGS_PENDING_UNLOCK));
 
-    pCritSect->s.Core.cNestings = 1;
+    ASMAtomicWriteS32(&pCritSect->s.Core.cNestings, 1);
     ASMAtomicWriteHandle(&pCritSect->s.Core.NativeThreadOwner, hNativeSelf);
 
@@ -188 +188 @@
     {
         ASMAtomicIncS32(&pCritSect->s.Core.cLockers);
-        pCritSect->s.Core.cNestings++;
-        pCritSect->s.Core.fFlags &= ~PDMCRITSECT_FLAGS_PENDING_UNLOCK;
+        ASMAtomicIncS32(&pCritSect->s.Core.cNestings);
+        ASMAtomicAndU32(&pCritSect->s.Core.fFlags, ~PDMCRITSECT_FLAGS_PENDING_UNLOCK);
         return VINF_SUCCESS;
     }
@@ -255 +255 @@
     {
         ASMAtomicIncS32(&pCritSect->s.Core.cLockers);
-        pCritSect->s.Core.cNestings++;
-        pCritSect->s.Core.fFlags &= ~PDMCRITSECT_FLAGS_PENDING_UNLOCK;
+        ASMAtomicIncS32(&pCritSect->s.Core.cNestings);
+        ASMAtomicAndU32(&pCritSect->s.Core.fFlags, ~PDMCRITSECT_FLAGS_PENDING_UNLOCK);
         return VINF_SUCCESS;
     }
@@ -317 +317 @@
     if (pCritSect->s.Core.cNestings > 1)
     {
-        pCritSect->s.Core.cNestings--;
+        ASMAtomicDecS32(&pCritSect->s.Core.cNestings);
         ASMAtomicDecS32(&pCritSect->s.Core.cLockers);
         return;
@@ -336 +336 @@
 #  endif
 # endif
-    pCritSect->s.Core.fFlags    &= ~PDMCRITSECT_FLAGS_PENDING_UNLOCK;
+    ASMAtomicAndU32(&pCritSect->s.Core.fFlags, ~PDMCRITSECT_FLAGS_PENDING_UNLOCK);
     Assert(pCritSect->s.Core.Strict.ThreadOwner == NIL_RTTHREAD);
     ASMAtomicWriteHandle(&pCritSect->s.Core.NativeThreadOwner, NIL_RTNATIVETHREAD);
-    pCritSect->s.Core.cNestings--;
+    ASMAtomicDecS32(&pCritSect->s.Core.cNestings);
 
     /* stop and decrement lockers. */
     STAM_PROFILE_ADV_STOP(&pCritSect->s.StatLocked, l);
+    ASMCompilerBarrier();
     if (ASMAtomicDecS32(&pCritSect->s.Core.cLockers) >= 0)
     {
@@ -368 +369 @@
     if (pCritSect->s.Core.cLockers == 0)
     {
-        pCritSect->s.Core.cNestings  = 0;
+        ASMAtomicWriteS32(&pCritSect->s.Core.cNestings, 0);
         RTNATIVETHREAD hNativeThread = pCritSect->s.Core.NativeThreadOwner;
-        pCritSect->s.Core.fFlags    &= ~PDMCRITSECT_FLAGS_PENDING_UNLOCK;
+        ASMAtomicAndU32(&pCritSect->s.Core.fFlags, ~PDMCRITSECT_FLAGS_PENDING_UNLOCK);
         STAM_PROFILE_ADV_STOP(&pCritSect->s.StatLocked, l);
 
@@ -380 +381 @@
         ASMAtomicWriteHandle(&pCritSect->s.Core.NativeThreadOwner, hNativeThread);
         STAM_PROFILE_ADV_START(&pCritSect->s.StatLocked, l);
-        pCritSect->s.Core.cNestings = 1;
-    }
-    pCritSect->s.Core.fFlags |= PDMCRITSECT_FLAGS_PENDING_UNLOCK;
+        ASMAtomicWriteS32(&pCritSect->s.Core.cNestings, 1);
+    }
+    ASMAtomicOrU32(&pCritSect->s.Core.fFlags, PDMCRITSECT_FLAGS_PENDING_UNLOCK);
 
     /*