Changeset 30111 in vbox for trunk/src/VBox/Runtime/common/misc/lockvalidator.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/common/misc/lockvalidator.cpp (modified) (14 diffs)

trunk/src/VBox/Runtime/common/misc/lockvalidator.cpp

@@ -341 +341 @@
 DECL_FORCE_INLINE(PRTLOCKVALRECUNION) rtLockValidatorReadRecUnionPtr(PRTLOCKVALRECUNION volatile *ppRec)
 {
-    PRTLOCKVALRECUNION p = (PRTLOCKVALRECUNION)ASMAtomicReadPtr((void * volatile *)ppRec);
+    PRTLOCKVALRECUNION p = ASMAtomicReadPtrT(ppRec, PRTLOCKVALRECUNION);
     RTLOCKVAL_ASSERT_PTR_ALIGN(p);
     return p;
@@ -351 +351 @@
 {
     RTLOCKVAL_ASSERT_PTR_ALIGN(pRecNew);
-    ASMAtomicWritePtr((void * volatile *)ppRec, pRecNew);
+    ASMAtomicWritePtr(ppRec, pRecNew);
 }
 
@@ -358 +358 @@
 DECL_FORCE_INLINE(PRTTHREADINT) rtLockValidatorReadThreadHandle(RTTHREAD volatile *phThread)
 {
-    PRTTHREADINT p = (PRTTHREADINT)ASMAtomicReadPtr((void * volatile *)phThread);
+    PRTTHREADINT p = ASMAtomicReadPtrT(phThread, PRTTHREADINT);
     RTLOCKVAL_ASSERT_PTR_ALIGN(p);
     return p;
@@ -367 +367 @@
 DECL_FORCE_INLINE(PRTLOCKVALRECSHRDOWN) rtLockValidatorUoReadSharedOwner(PRTLOCKVALRECSHRDOWN volatile *ppOwner)
 {
-    PRTLOCKVALRECSHRDOWN p = (PRTLOCKVALRECSHRDOWN)ASMAtomicUoReadPtr((void * volatile *)ppOwner);
+    PRTLOCKVALRECSHRDOWN p = ASMAtomicUoReadPtrT(ppOwner, PRTLOCKVALRECSHRDOWN);
     RTLOCKVAL_ASSERT_PTR_ALIGN(p);
     return p;
@@ -819 +819 @@
     if (pSrc)
     {
-        ASMAtomicUoWriteU32(&pDst->uLine,                           pSrc->uLine);
-        ASMAtomicUoWritePtr((void * volatile *)&pDst->pszFile,      pSrc->pszFile);
-        ASMAtomicUoWritePtr((void * volatile *)&pDst->pszFunction,  pSrc->pszFunction);
-        ASMAtomicUoWritePtr((void * volatile *)&pDst->uId,          (void *)pSrc->uId);
+        ASMAtomicUoWriteU32(&pDst->uLine,        pSrc->uLine);
+        ASMAtomicUoWritePtr(&pDst->pszFile,      pSrc->pszFile);
+        ASMAtomicUoWritePtr(&pDst->pszFunction,  pSrc->pszFunction);
+        ASMAtomicUoWritePtr((void * volatile *)&pDst->uId, (void *)pSrc->uId);
     }
     else
     {
-        ASMAtomicUoWriteU32(&pDst->uLine,                           0);
-        ASMAtomicUoWritePtr((void * volatile *)&pDst->pszFile,      NULL);
-        ASMAtomicUoWritePtr((void * volatile *)&pDst->pszFunction,  NULL);
-        ASMAtomicUoWritePtr((void * volatile *)&pDst->uId,          0);
+        ASMAtomicUoWriteU32(&pDst->uLine,        0);
+        ASMAtomicUoWritePtr(&pDst->pszFile,      NULL);
+        ASMAtomicUoWritePtr(&pDst->pszFunction,  NULL);
+        ASMAtomicUoWritePtr(&pDst->uId, (RTHCUINTPTR)0);
     }
 }
@@ -1359 +1359 @@
                 if (    !(*ppHashEntry)
                     ||  (*ppHashEntry)->cLookups + 128 < cLookups)
-                    ASMAtomicWritePtr((void * volatile *)ppHashEntry, &pChunk->aRefs[i]);
+                    ASMAtomicWritePtr(ppHashEntry, &pChunk->aRefs[i]);
 
 #ifdef RTLOCKVAL_WITH_CLASS_HASH_STATS
@@ -1469 +1469 @@
                     pNew->aRefs[0].fAutodidacticism = fAutodidacticism;
 
-                    ASMAtomicWritePtr((void * volatile *)&pChunk->pNext, pNew);
+                    ASMAtomicWritePtr(&pChunk->pNext, pNew);
                     rtLockValidatorClassRetain(pPriorClass);
                     rc = VINF_SUCCESS;
@@ -1547 +1547 @@
         if (RT_UNLIKELY(ppCoreNext))
             break;
-        pSibling = (PRTLOCKVALRECUNION)ASMAtomicXchgPtr((void * volatile *)ppCoreNext, NULL);
+        pSibling = ASMAtomicXchgPtrT(ppCoreNext, NULL, PRTLOCKVALRECUNION);
     }
 }
@@ -3472 +3472 @@
     {
         PRTLOCKVALRECSHRDOWN volatile *papOwners = pRec->papOwners;
-        ASMAtomicUoWritePtr((void * volatile *)&pRec->papOwners, NULL);
+        ASMAtomicUoWritePtr(&pRec->papOwners, NULL);
         ASMAtomicUoWriteU32(&pRec->cAllocated, 0);
 
@@ -3815 +3815 @@
                 }
 
-                ASMAtomicWritePtr((void * volatile *)&pShared->papOwners, papOwners);
+                ASMAtomicWritePtr(&pShared->papOwners, papOwners);
                 ASMAtomicWriteU32(&pShared->cAllocated, cAllocated);
             }
@@ -3858 +3858 @@
             for (uint32_t iEntry = 0; iEntry < cMax; iEntry++)
             {
-                if (ASMAtomicCmpXchgPtr((void * volatile *)&papOwners[iEntry], pEntry, NULL))
+                if (ASMAtomicCmpXchgPtr(&papOwners[iEntry], pEntry, NULL))
                 {
                     rtLockValidatorSerializeDetectionLeave();
@@ -3889 +3889 @@
     AssertReturnVoidStmt(pShared->Core.u32Magic == RTLOCKVALRECSHRD_MAGIC, rtLockValidatorSerializeDetectionLeave());
     if (RT_UNLIKELY(   iEntry >= pShared->cAllocated
-                    || !ASMAtomicCmpXchgPtr((void * volatile *)&pShared->papOwners[iEntry], NULL, pEntry)))
+                    || !ASMAtomicCmpXchgPtr(&pShared->papOwners[iEntry], NULL, pEntry)))
     {
         /* this shouldn't happen yet... */
@@ -3896 +3896 @@
         uint32_t const                  cMax      = pShared->cAllocated;
         for (iEntry = 0; iEntry < cMax; iEntry++)
-            if (ASMAtomicCmpXchgPtr((void * volatile *)&papOwners[iEntry], NULL, pEntry))
+            if (ASMAtomicCmpXchgPtr(&papOwners[iEntry], NULL, pEntry))
                break;
         AssertReturnVoidStmt(iEntry < cMax, rtLockValidatorSerializeDetectionLeave());
@@ -3931 +3931 @@
         while (iEntry < cEntries)
         {
-            PRTLOCKVALRECSHRDOWN pEntry = (PRTLOCKVALRECSHRDOWN)ASMAtomicXchgPtr((void * volatile *)&papEntries[iEntry], NULL);
+            PRTLOCKVALRECSHRDOWN pEntry = ASMAtomicXchgPtrT(&papEntries[iEntry], NULL, PRTLOCKVALRECSHRDOWN);
             if (pEntry)
             {