Changeset 20008 in vbox for trunk/src/VBox/Runtime/generic

Timestamp:

May 25, 2009 6:34:43 PM (16 years ago)

Author:

vboxsync

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

47728

Message:

PDMCritSect: rewrite, ring-0 unlocking not yet enabled.

File:

• trunk/src/VBox/Runtime/generic/critsect-generic.cpp (modified) (4 diffs)

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

@@ -251 +251 @@
      */
     pCritSect->cNestings = 1;
-    ASMAtomicXchgSize(&pCritSect->NativeThreadOwner, NativeThreadSelf);
+    ASMAtomicWriteHandle(&pCritSect->NativeThreadOwner, NativeThreadSelf);
 #ifdef RTCRITSECT_STRICT
     pCritSect->Strict.pszEnterFile = pszFile;
     pCritSect->Strict.u32EnterLine = uLine;
     pCritSect->Strict.uEnterId     = uId;
-    ASMAtomicXchgSize(&pCritSect->Strict.ThreadOwner, (RTUINTPTR)ThreadSelf); /* screw gcc and its pedantic warnings. */
+    ASMAtomicWriteHandle(&pCritSect->Strict.ThreadOwner, ThreadSelf);
 #endif
 
@@ -319 +319 @@
         {
 #ifdef RTCRITSECT_STRICT
-            rtThreadBlocking(ThreadSelf, RTTHREADSTATE_CRITSECT, (uintptr_t)pCritSect, pszFile, uLine, uId);
+            RTThreadBlocking(ThreadSelf, RTTHREADSTATE_CRITSECT, (uintptr_t)pCritSect, pszFile, uLine, uId);
 #endif
             int rc = RTSemEventWait(pCritSect->EventSem, RT_INDEFINITE_WAIT);
 #ifdef RTCRITSECT_STRICT
-            rtThreadUnblocked(ThreadSelf, RTTHREADSTATE_CRITSECT);
+            RTThreadUnblocked(ThreadSelf, RTTHREADSTATE_CRITSECT);
 #endif
             if (pCritSect->u32Magic != RTCRITSECT_MAGIC)
@@ -338 +338 @@
      */
     pCritSect->cNestings = 1;
-    ASMAtomicXchgSize(&pCritSect->NativeThreadOwner, NativeThreadSelf);
+    ASMAtomicWriteHandle(&pCritSect->NativeThreadOwner, NativeThreadSelf);
 #ifdef RTCRITSECT_STRICT
     pCritSect->Strict.pszEnterFile = pszFile;
     pCritSect->Strict.u32EnterLine = uLine;
     pCritSect->Strict.uEnterId     = uId;
-    ASMAtomicXchgSize(&pCritSect->Strict.ThreadOwner, (RTUINTPTR)ThreadSelf); /* screw gcc and its pedantic warnings. */
+    ASMAtomicWriteHandle(&pCritSect->Strict.ThreadOwner, ThreadSelf);
     RTThreadWriteLockInc(ThreadSelf);
 #endif
@@ -383 +383 @@
         if (pCritSect->Strict.ThreadOwner != NIL_RTTHREAD) /* May happen for PDMCritSects when entering GC/R0. */
             RTThreadWriteLockDec(pCritSect->Strict.ThreadOwner);
-        ASMAtomicXchgSize(&pCritSect->Strict.ThreadOwner, NIL_RTTHREAD);
-#endif
-        ASMAtomicXchgSize(&pCritSect->NativeThreadOwner, NIL_RTNATIVETHREAD);
+        ASMAtomicWriteHandle(&pCritSect->Strict.ThreadOwner, NIL_RTTHREAD);
+#endif
+        ASMAtomicWriteHandle(&pCritSect->NativeThreadOwner, NIL_RTNATIVETHREAD);
         if (ASMAtomicDecS32(&pCritSect->cLockers) >= 0)
         {