Changeset 30111 in vbox for trunk/src/VBox/HostDrivers/VBoxNetFlt/darwin

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/HostDrivers/VBoxNetFlt/darwin/VBoxNetFlt-darwin.cpp (modified) (5 diffs)

trunk/src/VBox/HostDrivers/VBoxNetFlt/darwin/VBoxNetFlt-darwin.cpp

@@ -236 +236 @@
     if (!ASMAtomicUoReadBool(&pThis->fDisconnectedFromHost))
     {
-        pIfNet = (ifnet_t)ASMAtomicUoReadPtr((void * volatile *)&pThis->u.s.pIfNet);
+        pIfNet = ASMAtomicUoReadPtrT(&pThis->u.s.pIfNet, ifnet_t);
         if (pIfNet)
             ifnet_reference(pIfNet);
@@ -666 +666 @@
     RTSpinlockAcquireNoInts(pThis->hSpinlock, &Tmp);
 
-    pIfNet = (ifnet_t)ASMAtomicUoReadPtr((void * volatile *)&pThis->u.s.pIfNet);
+    pIfNet = ASMAtomicUoReadPtrT(&pThis->u.s.pIfNet, ifnet_t);
     int cPromisc = VALID_PTR(pIfNet) ? VBOX_GET_PCOUNT(pIfNet) : - 1;
 
-    ASMAtomicUoWritePtr((void * volatile *)&pThis->u.s.pIfNet, NULL);
-    ASMAtomicUoWritePtr((void * volatile *)&pThis->u.s.pIfFilter, NULL);
+    ASMAtomicUoWritePtr(&pThis->u.s.pIfNet, NULL);
+    ASMAtomicUoWritePtr(&pThis->u.s.pIfFilter, NULL);
     ASMAtomicWriteBool(&pThis->u.s.fNeedSetPromiscuous, false);
     pThis->u.s.fSetPromiscuous = false;
@@ -914 +914 @@
     RTSPINLOCKTMP Tmp = RTSPINLOCKTMP_INITIALIZER;
     RTSpinlockAcquireNoInts(pThis->hSpinlock, &Tmp);
-    ASMAtomicUoWritePtr((void * volatile *)&pThis->u.s.pIfNet, pIfNet);
+    ASMAtomicUoWritePtr(&pThis->u.s.pIfNet, pIfNet);
     RTSpinlockReleaseNoInts(pThis->hSpinlock, &Tmp);
 
@@ -940 +940 @@
 
         RTSpinlockAcquireNoInts(pThis->hSpinlock, &Tmp);
-        pIfNet = (ifnet_t)ASMAtomicUoReadPtr((void * volatile *)&pThis->u.s.pIfNet);
+        pIfNet = ASMAtomicUoReadPtrT(&pThis->u.s.pIfNet, ifnet_t);
         if (pIfNet && !err)
         {
             ASMAtomicUoWriteBool(&pThis->fDisconnectedFromHost, false);
-            ASMAtomicUoWritePtr((void * volatile *)&pThis->u.s.pIfFilter, pIfFilter);
+            ASMAtomicUoWritePtr(&pThis->u.s.pIfFilter, pIfFilter);
             pIfNet = NULL; /* don't dereference it */
         }
@@ -1162 +1162 @@
      */
     RTSpinlockAcquireNoInts(pThis->hSpinlock, &Tmp);
-    pIfFilter = (interface_filter_t)ASMAtomicUoReadPtr((void * volatile *)&pThis->u.s.pIfFilter);
+    pIfFilter = ASMAtomicUoReadPtrT(&pThis->u.s.pIfFilter, interface_filter_t);
     if (pIfFilter)
-        ASMAtomicUoWritePtr((void * volatile *)&pThis->u.s.pIfFilter, NULL);
+        ASMAtomicUoWritePtr(&pThis->u.s.pIfFilter, NULL);
     RTSpinlockReleaseNoInts(pThis->hSpinlock, &Tmp);