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

trunk/src/VBox/Runtime/common/alloc/memcache.cpp

@@ -308 +308 @@
 
             /* Make it the hint. */
-            ASMAtomicWritePtr((void * volatile *)&pThis->pPageHint, pPage);
+            ASMAtomicWritePtr(&pThis->pPageHint, pPage);
 
             /* Link the page. */
             PRTMEMCACHEPAGE pPrevPage = pThis->pPageHead;
             if (!pPrevPage)
-                ASMAtomicWritePtr((void * volatile *)&pThis->pPageHead, pPage);
+                ASMAtomicWritePtr(&pThis->pPageHead, pPage);
             else
             {
                 while (pPrevPage->pNext)
                     pPrevPage = pPrevPage->pNext;
-                ASMAtomicWritePtr((void * volatile *)&pPrevPage->pNext, pPage);
+                ASMAtomicWritePtr(&pPrevPage->pNext, pPage);
             }
 
@@ -359 +359 @@
      * Try grab a free object from the stack.
      */
-    PRTMEMCACHEFREEOBJ pObj = (PRTMEMCACHEFREEOBJ)ASMAtomicUoReadPtr((void * volatile *)&pThis->pFreeTop);
+    PRTMEMCACHEFREEOBJ pObj = ASMAtomicUoReadPtrT(&pThis->pFreeTop, PRTMEMCACHEFREEOBJ);
     if (pObj)
     {
@@ -365 +365 @@
         do
         {
-            pNext = (PRTMEMCACHEFREEOBJ)ASMAtomicUoReadPtr((void * volatile *)&pObj->pNext);
-            if (ASMAtomicCmpXchgPtr((void * volatile *)&pThis->pFreeTop, pNext, pObj))
+            pNext = ASMAtomicUoReadPtrT(&pObj->pNext, PRTMEMCACHEFREEOBJ);
+            if (ASMAtomicCmpXchgPtr(&pThis->pFreeTop, pNext, pObj))
             {
                 *ppvObj = pObj;
                 return VINF_SUCCESS;
             }
-            pObj = (PRTMEMCACHEFREEOBJ)ASMAtomicUoReadPtr((void * volatile *)&pThis->pFreeTop);
+            pObj = ASMAtomicUoReadPtrT(&pThis->pFreeTop, PRTMEMCACHEFREEOBJ);
         } while (pObj);
     }
@@ -400 +400 @@
      * Grab a free object at the page level.
      */
-    PRTMEMCACHEPAGE pPage = (PRTMEMCACHEPAGE)ASMAtomicReadPtr((void * volatile *)&pThis->pPageHint);
+    PRTMEMCACHEPAGE pPage = ASMAtomicReadPtrT(&pThis->pPageHint, PRTMEMCACHEPAGE);
     int32_t iObj = pPage ? rtMemCacheGrabObj(pPage) : -1;
     if (iObj < 0)
@@ -412 +412 @@
                 {
                     if (iObj > 0)
-                        ASMAtomicWritePtr((void * volatile *)&pThis->pPageHint, pPage);
+                        ASMAtomicWritePtr(&pThis->pPageHint, pPage);
                     break;
                 }
@@ -511 +511 @@
         do
         {
-            pNext = (PRTMEMCACHEFREEOBJ)ASMAtomicUoReadPtr((void * volatile *)&pThis->pFreeTop);
+            pNext = ASMAtomicUoReadPtrT(&pThis->pFreeTop, PRTMEMCACHEFREEOBJ);
             pObj->pNext = pNext;
-        } while (!ASMAtomicCmpXchgPtr((void * volatile *)&pThis->pFreeTop, pObj, pNext));
+        } while (!ASMAtomicCmpXchgPtr(&pThis->pFreeTop, pObj, pNext));
     }
     else