Changeset 30112 in vbox for trunk/src/VBox/HostDrivers

Timestamp:

Jun 9, 2010 12:31:50 PM (15 years ago)

Author:

vboxsync

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

62507

Message:

iprt/asm.h,*: Added ASMAtomicWriteNullPtr and ASMAtomicUoWriteNullPtr to better deal with NULL being 0 in C++.

Location:

trunk/src/VBox/HostDrivers

Files:

• Support/SUPLib.cpp (modified) (1 diff)
• Support/SUPSvcGrant.cpp (modified) (1 diff)
• VBoxNetFlt/darwin/VBoxNetFlt-darwin.cpp (modified) (2 diffs)
• VBoxNetFlt/linux/VBoxNetFlt-linux.c (modified) (3 diffs)
• VBoxNetFlt/solaris/VBoxNetFlt-solaris.c (modified) (3 diffs)

trunk/src/VBox/HostDrivers/Support/SUPLib.cpp

@@ -508 +508 @@
         if (g_pSUPGlobalInfoPage)
         {
-            ASMAtomicWritePtr((void * volatile *)&g_pSUPGlobalInfoPage, NULL);
-            ASMAtomicWritePtr((void * volatile *)&g_pSUPGlobalInfoPageR0, NULL);
+            ASMAtomicWriteNullPtr((void * volatile *)&g_pSUPGlobalInfoPage);
+            ASMAtomicWriteNullPtr((void * volatile *)&g_pSUPGlobalInfoPageR0);
             ASMAtomicWriteSize(&g_HCPhysSUPGlobalInfoPage, NIL_RTHCPHYS);
             /* just a little safe guard against threads using the page. */

trunk/src/VBox/HostDrivers/Support/SUPSvcGrant.cpp

@@ -975 +975 @@
     unsigned cSessions = 0;
     for (PSUPSVCGRANTSESSION pCur = pThis->pSessionHead; pCur; pCur = pCur->pNext)
-        ASMAtomicWritePtr(&pCur->pParent, NULL);
+        ASMAtomicWriteNullPtr(&pCur->pParent);
 
     RTCritSectLeave(&pThis->CritSect);

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

@@ -669 +669 @@
     int cPromisc = VALID_PTR(pIfNet) ? VBOX_GET_PCOUNT(pIfNet) : - 1;
 
-    ASMAtomicUoWritePtr(&pThis->u.s.pIfNet, NULL);
-    ASMAtomicUoWritePtr(&pThis->u.s.pIfFilter, NULL);
+    ASMAtomicUoWriteNullPtr(&pThis->u.s.pIfNet);
+    ASMAtomicUoWriteNullPtr(&pThis->u.s.pIfFilter);
     ASMAtomicWriteBool(&pThis->u.s.fNeedSetPromiscuous, false);
     pThis->u.s.fSetPromiscuous = false;
@@ -1164 +1164 @@
     pIfFilter = ASMAtomicUoReadPtrT(&pThis->u.s.pIfFilter, interface_filter_t);
     if (pIfFilter)
-        ASMAtomicUoWritePtr(&pThis->u.s.pIfFilter, NULL);
+        ASMAtomicUoWriteNullPtr(&pThis->u.s.pIfFilter);
     RTSpinlockReleaseNoInts(pThis->hSpinlock, &Tmp);
 

trunk/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c

@@ -651 +651 @@
     pPriv = qdisc_priv(pQdisc);
     Assert(pPriv->pVBoxNetFlt == pThis);
-    ASMAtomicWritePtr(&pPriv->pVBoxNetFlt, NULL);
+    ASMAtomicWriteNullPtr(&pPriv->pVBoxNetFlt);
 
     QDISC_LOG(("vboxNetFltLinuxQdiscRemove: refcnt=%d num_tx_queues=%d\n",
@@ -1946 +1946 @@
 #endif /* VBOXNETFLT_WITH_QDISC */
         RTSpinlockAcquireNoInts(pThis->hSpinlock, &Tmp);
-        ASMAtomicUoWritePtr(&pThis->u.s.pDev, NULL);
+        ASMAtomicUoWriteNullPtr(&pThis->u.s.pDev);
         RTSpinlockReleaseNoInts(pThis->hSpinlock, &Tmp);
         dev_put(pDev);
@@ -1973 +1973 @@
     ASMAtomicWriteBool(&pThis->u.s.fRegistered, false);
     ASMAtomicWriteBool(&pThis->fDisconnectedFromHost, true);
-    ASMAtomicUoWritePtr(&pThis->u.s.pDev, NULL);
+    ASMAtomicUoWriteNullPtr(&pThis->u.s.pDev);
     RTSpinlockReleaseNoInts(pThis->hSpinlock, &Tmp);
 

trunk/src/VBox/HostDrivers/VBoxNetFlt/solaris/VBoxNetFlt-solaris.c

@@ -924 +924 @@
             RTTimerStop(pPromiscStream->pIp6Timer);
             RTTimerDestroy(pPromiscStream->pIp6Timer);
-            ASMAtomicUoWritePtr(&pPromiscStream->pIp6Timer, NULL);
+            ASMAtomicUoWriteNullPtr(&pPromiscStream->pIp6Timer);
         }
 #endif
@@ -944 +944 @@
     switch (pStream->Type)
     {
-        case kIp4Stream:        ASMAtomicUoWritePtr(pStream->pThis->u.s.pvIp4Stream, NULL);     break;
-        case kIp6Stream:        ASMAtomicUoWritePtr(pStream->pThis->u.s.pvIp6Stream, NULL);     break;
-        case kArpStream:        ASMAtomicUoWritePtr(pStream->pThis->u.s.pvArpStream, NULL);     break;
-        case kPromiscStream:    ASMAtomicUoWritePtr(pStream->pThis->u.s.pvPromiscStream, NULL); break;
+        case kIp4Stream:        ASMAtomicUoWriteNullPtr(pStream->pThis->u.s.pvIp4Stream);     break;
+        case kIp6Stream:        ASMAtomicUoWriteNullPtr(pStream->pThis->u.s.pvIp6Stream);     break;
+        case kArpStream:        ASMAtomicUoWriteNullPtr(pStream->pThis->u.s.pvArpStream);     break;
+        case kPromiscStream:    ASMAtomicUoWriteNullPtr(pStream->pThis->u.s.pvPromiscStream); break;
         default:    /* Heh. */
         {
@@ -2578 +2578 @@
         RTTimerStop(pPromiscStream->pIp6Timer);
         RTTimerDestroy(pPromiscStream->pIp6Timer);
-        ASMAtomicUoWritePtr(&pPromiscStream->pIp6Timer, NULL);
+        ASMAtomicUoWriteNullPtr(&pPromiscStream->pIp6Timer);
     }
 #endif