Changeset 30117 in vbox for trunk/src

Timestamp:

Jun 9, 2010 12:53:55 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/src/VBox/HostDrivers/VBoxNetFlt

Files:

• VBoxNetFltInternal.h (modified) (1 diff)
• solaris/VBoxNetFlt-solaris.c (modified) (11 diffs)

trunk/src/VBox/HostDrivers/VBoxNetFlt/VBoxNetFltInternal.h

@@ -192 +192 @@
 #  else
             /** Pointer to the bound IPv4 stream. */
-            void volatile *pvIp4Stream;
+            struct vboxnetflt_stream_t * volatile pvIp4Stream;
             /** Pointer to the bound IPv6 stream. */
-            void volatile *pvIp6Stream;
+            struct vboxnetflt_stream_t * volatile pIp6Stream;
             /** Pointer to the bound ARP stream. */
-            void volatile *pvArpStream;
+            struct vboxnetflt_stream_t * volatile pArpStream;
             /** Pointer to the unbound promiscuous stream. */
-            void volatile *pvPromiscStream;
+            struct vboxnetflt_promisc_stream_t * volatile pPromiscStream;
             /** Whether we are attaching to IPv6 stream dynamically now. */
             bool volatile fAttaching;

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

@@ -781 +781 @@
     switch (pStream->Type)
     {
-        case kIp4Stream:        ASMAtomicUoWritePtr(&pThis->u.s.pvIp4Stream, pStream);        break;
-        case kIp6Stream:        ASMAtomicUoWritePtr(&pThis->u.s.pvIp6Stream, pStream);        break;
-        case kArpStream:        ASMAtomicUoWritePtr(&pThis->u.s.pvArpStream, pStream);        break;
-        case kPromiscStream:    ASMAtomicUoWritePtr(&pThis->u.s.pvPromiscStream, pStream);    break;
+        case kIp4Stream:        ASMAtomicUoWritePtr(&pThis->u.s.pIp4Stream, pStream);        break;
+        case kIp6Stream:        ASMAtomicUoWritePtr(&pThis->u.s.pIp6Stream, pStream);        break;
+        case kArpStream:        ASMAtomicUoWritePtr(&pThis->u.s.pArpStream, pStream);        break;
+        case kPromiscStream:    ASMAtomicUoWritePtr(&pThis->u.s.pPromiscStream, pStream);    break;
         default:    /* Heh. */
         {
@@ -944 +944 @@
     switch (pStream->Type)
     {
-        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;
+        case kIp4Stream:        ASMAtomicUoWriteNullPtr(&pStream->pThis->u.s.pIp4Stream);     break;
+        case kIp6Stream:        ASMAtomicUoWriteNullPtr(&pStream->pThis->u.s.pIp6Stream);     break;
+        case kArpStream:        ASMAtomicUoWriteNullPtr(&pStream->pThis->u.s.pArpStream);     break;
+        case kPromiscStream:    ASMAtomicUoWriteNullPtr(&pStream->pThis->u.s.pPromiscStream); break;
         default:    /* Heh. */
         {
@@ -2476 +2476 @@
         && RT_LIKELY(pTimer))
     {
-        vboxnetflt_stream_t *pIp6Stream  = ASMAtomicUoReadPtrT(pThis->u.s.pvIp6Stream, vboxnetflt_stream_t *);
+        vboxnetflt_stream_t *pIp6Stream = ASMAtomicUoReadPtrT(&pThis->u.s.pIp6Stream, vboxnetflt_stream_t *);
         bool fIp6Attaching = ASMAtomicUoReadBool(&pThis->u.s.fAttaching);
         if (   !pIp6Stream
@@ -2512 +2512 @@
 
     int rc = VERR_GENERAL_FAILURE;
-    vboxnetflt_promisc_stream_t *pPromiscStream = ASMAtomicUoReadPtrT(&pThis->u.s.pvPromiscStream, vboxnetflt_promisc_stream_t *);
+    vboxnetflt_promisc_stream_t *pPromiscStream = ASMAtomicUoReadPtrT(&pThis->u.s.pPromiscStream, vboxnetflt_promisc_stream_t *);
     if (RT_LIKELY(pPromiscStream))
     {
@@ -2566 +2566 @@
     vboxNetFltSolarisCloseStream(pThis);
     int rc = VINF_SUCCESS;
-    if (pThis->u.s.pvIp4Stream)
+    if (pThis->u.s.pIp4Stream)
         rc = vboxNetFltSolarisAttachIp4(pThis, false /* fAttach */);
-    if (pThis->u.s.pvIp6Stream)
+    if (pThis->u.s.pIp6Stream)
         rc = vboxNetFltSolarisAttachIp6(pThis, false /* fAttach */);
 
 #ifdef VBOXNETFLT_SOLARIS_IPV6_POLLING
-    vboxnetflt_promisc_stream_t *pPromiscStream = ASMAtomicUoReadPtrT(&pThis->u.s.pvPromiscStream, vboxnetflt_promisc_stream_t *);
+    vboxnetflt_promisc_stream_t *pPromiscStream = ASMAtomicUoReadPtrT(&pThis->u.s.pPromiscStream, vboxnetflt_promisc_stream_t *);
     if (   pPromiscStream
         && pPromiscStream->pIp6Timer == NULL)
@@ -3198 +3198 @@
     Assert(pStream->Type == kPromiscStream);
 
-    vboxnetflt_promisc_stream_t *pPromiscStream = ASMAtomicUoReadPtrT(&pThis->u.s.pvPromiscStream, vboxnetflt_promisc_stream_t *);
+    vboxnetflt_promisc_stream_t *pPromiscStream = ASMAtomicUoReadPtrT(&pThis->u.s.pPromiscStream, vboxnetflt_promisc_stream_t *);
     if (RT_UNLIKELY(!pPromiscStream))
     {
@@ -3579 +3579 @@
      * Enable/disable promiscuous mode.
      */
-    vboxnetflt_stream_t *pStream = ASMAtomicUoReadPtrT(&pThis->u.s.pvPromiscStream, vboxnetflt_stream_t *);
+    vboxnetflt_promisc_stream_t *pStream = ASMAtomicUoReadPtrT(&pThis->u.s.pPromiscStream, vboxnetflt_stream_t *);
     if (pStream)
     {
-        if (pStream->pReadQueue)
-        {
-            int rc = vboxNetFltSolarisPromiscReq(pStream->pReadQueue, fActive);
+        if (pStream->Stream.pReadQueue)
+        {
+            int rc = vboxNetFltSolarisPromiscReq(pStream->Stream.pReadQueue, fActive);
             if (RT_FAILURE(rc))
                 LogRel((DEVICE_NAME ":vboxNetFltPortOsSetActive failed to request promiscuous mode! rc=%d\n", rc));
@@ -3680 +3680 @@
      */
     pThis->u.s.hIface = NULL;
-    pThis->u.s.pvIp4Stream = NULL;
-    pThis->u.s.pvIp6Stream = NULL;
-    pThis->u.s.pvArpStream = NULL;
-    pThis->u.s.pvPromiscStream = NULL;
+    pThis->u.s.pIp4Stream = NULL;
+    pThis->u.s.pIp6Stream = NULL;
+    pThis->u.s.pArpStream = NULL;
+    pThis->u.s.pPromiscStream = NULL;
     pThis->u.s.fAttaching = false;
     pThis->u.s.fVLAN = false;
@@ -3830 +3830 @@
          * We either bind to both or neither; so atomic reading one should be sufficient.
          */
-        vboxnetflt_stream_t *pIp4Stream = ASMAtomicUoReadPtrT(&pThis->u.s.pvIp4Stream, vboxnetflt_stream_t *);
+        vboxnetflt_stream_t *pIp4Stream = ASMAtomicUoReadPtrT(&pThis->u.s.pIp4Stream, vboxnetflt_stream_t *);
         if (!pIp4Stream)
             return rc;
@@ -3849 +3849 @@
                 LogFlow((DEVICE_NAME ":vboxNetFltPortOsXmit INTNETTRUNKDIR_HOST ARP\n"));
 
-                vboxnetflt_stream_t *pArpStream = ASMAtomicUoReadPtrT(&pThis->u.s.pvArpStream, vboxnetflt_stream_t *);
+                vboxnetflt_stream_t *pArpStream = ASMAtomicUoReadPtrT(&pThis->u.s.pArpStream, vboxnetflt_stream_t *);
                 if (pArpStream)
                 {
@@ -3876 +3876 @@
             else
             {
-                 vboxnetflt_stream_t *pIp6Stream  = ASMAtomicUoReadPtrT(&pThis->u.s.pvIp6Stream, vboxnetflt_stream_t *);
+                 vboxnetflt_stream_t *pIp6Stream = ASMAtomicUoReadPtrT(&pThis->u.s.pIp6Stream, vboxnetflt_stream_t *);
                  if (   pEthHdr->EtherType == RT_H2BE_U16(RTNET_ETHERTYPE_IPV6)
                      && pIp6Stream)