Changeset 30112 in vbox for trunk

Timestamp:

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

Author:

vboxsync

Message:

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

Location:

trunk

Files:

• include/iprt/asm.h (modified) (4 diffs)
• src/VBox/Devices/Storage/DrvDiskIntegrity.cpp (modified) (1 diff)
• src/VBox/HostDrivers/Support/SUPLib.cpp (modified) (1 diff)
• src/VBox/HostDrivers/Support/SUPSvcGrant.cpp (modified) (1 diff)
• src/VBox/HostDrivers/VBoxNetFlt/darwin/VBoxNetFlt-darwin.cpp (modified) (2 diffs)
• src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c (modified) (3 diffs)
• src/VBox/HostDrivers/VBoxNetFlt/solaris/VBoxNetFlt-solaris.c (modified) (3 diffs)
• src/VBox/Main/ConsoleImpl.cpp (modified) (1 diff)
• src/VBox/Runtime/common/log/log.cpp (modified) (1 diff)
• src/VBox/Runtime/common/misc/lockvalidator.cpp (modified) (2 diffs)
• src/VBox/Runtime/common/misc/thread.cpp (modified) (3 diffs)
• src/VBox/Runtime/generic/tls-generic.cpp (modified) (1 diff)
• src/VBox/Runtime/r3/posix/fileaio-posix.cpp (modified) (1 diff)
• src/VBox/VMM/VMMR0/GVMMR0.cpp (modified) (1 diff)
• src/VBox/VMM/VMReq.cpp (modified) (2 diffs)

trunk/include/iprt/asm.h

@@ -2416 +2416 @@
  * Atomically writes a pointer value, ordered.
  *
- * @returns Current *pv value
  * @param   ppv     Pointer to the pointer variable.
  * @param   pv      The pointer value to assign to *ppv.
@@ -2433 +2432 @@
 
 /**
- * Convenience macro for avoiding the annoying casting with ASMAtomicWritePtr.
- *
- * @returns Current *pv value
+ * Atomically writes a pointer value, ordered.
+ *
  * @param   ppv     Pointer to the pointer variable.
- * @param   pv      The pointer value to assign to *ppv. If NULL, you may have
- *                  to cast it to the right pointer type for GCC to be happy.
+ * @param   pv      The pointer value to assign to *ppv. If NULL use
+ *                  ASMAtomicWriteNullPtr or you'll land in trouble.
  *
  * @remarks This is relatively type safe on GCC platforms when @a pv isn't
@@ -2470 +2468 @@
 
 /**
- * Convenience macro for avoiding the annoying casting involved when using
- * ASMAtomicWritePtr.
+ * Atomically sets a pointer to NULL, ordered.
+ *
+ * @param   ppv     Pointer to the pointer variable that should be set to NULL.
+ *
+ * @remarks This is relatively type safe on GCC platforms.
+ */
+#ifdef __GNUC__
+# define ASMAtomicWriteNullPtr(ppv) \
+    do \
+    { \
+        __typeof__(*(ppv)) volatile * const ppvTypeChecked = (ppv); \
+        AssertCompile(sizeof(*ppv) == sizeof(void *)); \
+        Assert(!( (uintptr_t)ppv & ((ARCH_BITS / 8) - 1) )); \
+        ASMAtomicWritePtrVoid((void * volatile *)(ppvTypeChecked), NULL); \
+    } while (0)
+#else
+# define ASMAtomicWriteNullPtr(ppv) \
+    do \
+    { \
+        AssertCompile(sizeof(*ppv) == sizeof(void *)); \
+        Assert(!( (uintptr_t)ppv & ((ARCH_BITS / 8) - 1) )); \
+        ASMAtomicWritePtrVoid((void * volatile *)(ppv), NULL); \
+    } while (0)
+#endif
+
+
+/**
+ * Atomically writes a pointer value, unordered.
  *
  * @returns Current *pv value
  * @param   ppv     Pointer to the pointer variable.
- * @param   pv      The pointer value to assign to *ppv.
+ * @param   pv      The pointer value to assign to *ppv. If NULL use
+ *                  ASMAtomicUoWriteNullPtr or you'll land in trouble.
  *
  * @remarks This is relatively type safe on GCC platforms when @a pv isn't
@@ -2501 +2526 @@
         Assert(!( (uintptr_t)ppv & ((ARCH_BITS / 8) - 1) )); \
         *(ppv) = pv; \
+    } while (0)
+#endif
+
+
+/**
+ * Atomically sets a pointer to NULL, unordered.
+ *
+ * @param   ppv     Pointer to the pointer variable that should be set to NULL.
+ *
+ * @remarks This is relatively type safe on GCC platforms.
+ */
+#ifdef __GNUC__
+# define ASMAtomicUoWriteNullPtr(ppv) \
+    do \
+    { \
+        __typeof__(*(ppv)) volatile * const ppvTypeChecked = (ppv); \
+        AssertCompile(sizeof(*ppv) == sizeof(void *)); \
+        Assert(!( (uintptr_t)ppv & ((ARCH_BITS / 8) - 1) )); \
+        *(ppvTypeChecked) = NULL; \
+    } while (0)
+#else
+# define ASMAtomicUoWriteNullPtr(ppv) \
+    do \
+    { \
+        AssertCompile(sizeof(*ppv) == sizeof(void *)); \
+        Assert(!( (uintptr_t)ppv & ((ARCH_BITS / 8) - 1) )); \
+        *(ppv) = NULL; \
     } while (0)
 #endif

trunk/src/VBox/Devices/Storage/DrvDiskIntegrity.cpp

@@ -490 +490 @@
     Assert(pReqActive->pIoReq == pIoReq);
 
-    ASMAtomicWritePtr(&pReqActive->pIoReq, NULL);
+    ASMAtomicWriteNullPtr(&pReqActive->pIoReq);
 }
 

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

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -8123 +8123 @@
         unsigned iLed = pData->iLastLUN - pData->iFirstLUN + 1;
         while (iLed-- > 0)
-            ASMAtomicWritePtr(&pData->papLeds[iLed], NULL);
+            ASMAtomicWriteNullPtr(&pData->papLeds[iLed]);
     }
 }

trunk/src/VBox/Runtime/common/log/log.cpp

@@ -1905 +1905 @@
                 ||  g_aPerThreadLoggers[i].uKey == uKey)
             {
-                ASMAtomicWritePtr((void * volatile *)&g_aPerThreadLoggers[i].uKey, (void *)NULL);
-                ASMAtomicWritePtr(&g_aPerThreadLoggers[i].pLogger, (PRTLOGGER)NULL);
+                ASMAtomicWriteNullPtr((void * volatile *)&g_aPerThreadLoggers[i].uKey);
+                ASMAtomicWriteNullPtr(&g_aPerThreadLoggers[i].pLogger);
                 ASMAtomicWriteHandle(&g_aPerThreadLoggers[i].NativeThread, NIL_RTNATIVETHREAD);
                 ASMAtomicDecS32(&g_cPerThreadLoggers);

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

@@ -827 +827 @@
     {
         ASMAtomicUoWriteU32(&pDst->uLine,        0);
-        ASMAtomicUoWritePtr(&pDst->pszFile,      NULL);
-        ASMAtomicUoWritePtr(&pDst->pszFunction,  NULL);
+        ASMAtomicUoWriteNullPtr(&pDst->pszFile);
+        ASMAtomicUoWriteNullPtr(&pDst->pszFunction);
         ASMAtomicUoWritePtr(&pDst->uId, (RTHCUINTPTR)0);
     }
@@ -3472 +3472 @@
     {
         PRTLOCKVALRECSHRDOWN volatile *papOwners = pRec->papOwners;
-        ASMAtomicUoWritePtr(&pRec->papOwners, NULL);
+        ASMAtomicUoWriteNullPtr(&pRec->papOwners);
         ASMAtomicUoWriteU32(&pRec->cAllocated, 0);
 

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

@@ -1349 +1349 @@
             if (   pThread->LockValidator.pRec
                 && pThread->LockValidator.enmRecState == enmCurState)
-                ASMAtomicWritePtr(&pThread->LockValidator.pRec, NULL);
+                ASMAtomicWriteNullPtr(&pThread->LockValidator.pRec);
         }
         /* This is a bit ugly... :-/ */
@@ -1355 +1355 @@
                      || enmActualState == RTTHREADSTATE_INITIALIZING)
                  && pThread->LockValidator.pRec)
-            ASMAtomicWritePtr(&pThread->LockValidator.pRec, NULL);
+            ASMAtomicWriteNullPtr(&pThread->LockValidator.pRec);
         Assert(   pThread->LockValidator.pRec == NULL
                || RTTHREAD_IS_SLEEPING(enmActualState));
@@ -1441 +1441 @@
     PRTTHREADINT pThread = (PRTTHREADINT)pNode;
     RTTLS iTls = (RTTLS)(uintptr_t)pvUser;
-    ASMAtomicWritePtr(&pThread->apvTlsEntries[iTls], NULL);
+    ASMAtomicWriteNullPtr(&pThread->apvTlsEntries[iTls]);
     return 0;
 }

trunk/src/VBox/Runtime/generic/tls-generic.cpp

@@ -89 +89 @@
         return VERR_INVALID_PARAMETER;
 
-    ASMAtomicWritePtr(&g_apfnDestructors[iTls], NULL);
+    ASMAtomicWriteNullPtr(&g_apfnDestructors[iTls]);
     rtThreadClearTlsEntry(iTls);
     ASMAtomicBitClear(&g_au32AllocatedBitmap[0], iTls);

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

@@ -493 +493 @@
         AssertRC(rc);
 
-        ASMAtomicWritePtr(&pCtxInt->pReqToCancel, NULL);
+        ASMAtomicWriteNullPtr(&pCtxInt->pReqToCancel);
         pReqInt->Rc = VERR_FILE_AIO_CANCELED;
         RTFILEAIOREQ_SET_STATE(pReqInt, COMPLETED);

trunk/src/VBox/VMM/VMMR0/GVMMR0.cpp

@@ -1067 +1067 @@
     pHandle->iNext = pGVMM->iFreeHead;
     pGVMM->iFreeHead = iHandle;
-    ASMAtomicWritePtr(&pHandle->pGVM,               (PGVM)NULL);
-    ASMAtomicWritePtr(&pHandle->pVM,                 (PVM)NULL);
-    ASMAtomicWritePtr(&pHandle->pvObj,            (void *)NULL);
-    ASMAtomicWritePtr(&pHandle->pSession, (PSUPDRVSESSION)NULL);
+    ASMAtomicWriteNullPtr(&pHandle->pGVM);
+    ASMAtomicWriteNullPtr(&pHandle->pVM);
+    ASMAtomicWriteNullPtr(&pHandle->pvObj);
+    ASMAtomicWriteNullPtr(&pHandle->pSession);
     ASMAtomicWriteSize(&pHandle->hEMT0,     NIL_RTNATIVETHREAD);
     ASMAtomicWriteSize(&pHandle->ProcId,         NIL_RTPROCESS);

trunk/src/VBox/VMM/VMReq.cpp

@@ -490 +490 @@
         if (ASMAtomicCmpXchgPtr(ppHead, pHead, pList))
             return;
-        ASMAtomicWritePtr(&pTail->pNext, NULL);
+        ASMAtomicWriteNullPtr(&pTail->pNext);
         ASMCompilerBarrier();
         if (ASMAtomicCmpXchgPtr(ppHead, pHead, NULL))
@@ -1009 +1009 @@
         pReqRet = pReqRet->pNext;
     } while (pReqRet->pNext);
-    ASMAtomicWritePtr(&pPrev->pNext, NULL);
+    ASMAtomicWriteNullPtr(&pPrev->pNext);
 
     /* Push the others back onto the list (end of it). */