Changeset 30111 in vbox for trunk/src/VBox/Runtime/r3/posix/fileaio-posix.cpp

Timestamp:

Jun 9, 2010 12:14:59 PM (15 years ago)

Author:

vboxsync

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

62505

Message:

iprt/asm.h,*: Revised the ASMAtomic*Ptr functions and macros. The new saves lots of unsafe (void * volatile *) casts as well as adding some type safety when using GCC (typeof rulez).

File:

• trunk/src/VBox/Runtime/r3/posix/fileaio-posix.cpp (modified) (7 diffs)

trunk/src/VBox/Runtime/r3/posix/fileaio-posix.cpp

@@ -198 +198 @@
         for (unsigned iSlot = 0; iSlot < RT_ELEMENTS(pCtxInt->apReqsNewHead); iSlot++)
         {
-            PRTFILEAIOREQINTERNAL pReqHead = (PRTFILEAIOREQINTERNAL)ASMAtomicXchgPtr((void* volatile*)&pCtxInt->apReqsNewHead[iSlot],
-                                                                                     NULL);
+            PRTFILEAIOREQINTERNAL pReqHead = ASMAtomicXchgPtrT(&pCtxInt->apReqsNewHead[iSlot], NULL, PRTFILEAIOREQINTERNAL);
 
             while (  (pCtxInt->iFirstFree < pCtxInt->cReqsWaitMax)
@@ -249 +248 @@
 
         /* Check if a request needs to be canceled. */
-        PRTFILEAIOREQINTERNAL pReqToCancel = (PRTFILEAIOREQINTERNAL)ASMAtomicReadPtr((void* volatile*)&pCtxInt->pReqToCancel);
+        PRTFILEAIOREQINTERNAL pReqToCancel = ASMAtomicReadPtrT(&pCtxInt->pReqToCancel, PRTFILEAIOREQINTERNAL);
         if (pReqToCancel)
         {
@@ -487 +486 @@
 
         Assert(!pCtxInt->pReqToCancel);
-        ASMAtomicWritePtr((void* volatile*)&pCtxInt->pReqToCancel, pReqInt);
+        ASMAtomicWritePtr(&pCtxInt->pReqToCancel, pReqInt);
         rtFileAioCtxWakeup(pCtxInt);
 
@@ -494 +493 @@
         AssertRC(rc);
 
-        ASMAtomicWritePtr((void* volatile*)&pCtxInt->pReqToCancel, NULL);
+        ASMAtomicWritePtr(&pCtxInt->pReqToCancel, NULL);
         pReqInt->Rc = VERR_FILE_AIO_CANCELED;
         RTFILEAIOREQ_SET_STATE(pReqInt, COMPLETED);
@@ -819 +818 @@
         unsigned iSlot = 0;
         while (  (iSlot < RT_ELEMENTS(pCtxInt->apReqsNewHead))
-               && !ASMAtomicCmpXchgPtr((void * volatile *)&pCtxInt->apReqsNewHead[iSlot], pHead, NULL))
+               && !ASMAtomicCmpXchgPtr(&pCtxInt->apReqsNewHead[iSlot], pHead, NULL))
             iSlot++;
 
@@ -825 +824 @@
         {
             /* Nothing found. */
-            PRTFILEAIOREQINTERNAL pOldHead = (PRTFILEAIOREQINTERNAL)ASMAtomicXchgPtr((void * volatile *)&pCtxInt->apReqsNewHead[0],
-                                                                                      NULL);
+            PRTFILEAIOREQINTERNAL pOldHead = ASMAtomicXchgPtrT(&pCtxInt->apReqsNewHead[0], NULL, PRTFILEAIOREQINTERNAL);
 
             /* Find the end of the current head and link the old list to the current. */
@@ -835 +833 @@
             pTail->pNext = pOldHead;
 
-            ASMAtomicXchgPtr((void * volatile *)&pCtxInt->apReqsNewHead[0], pHead);
+            ASMAtomicWritePtr(&pCtxInt->apReqsNewHead[0], pHead);
         }