Changeset 28277 in vbox

Timestamp:

Apr 13, 2010 8:31:08 PM (15 years ago)

Author:

vboxsync

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

60019

Message:

Network/Dev*: Preparing for pfnXmitPending to be callable and the TX threads move from the devices to the drivers.

Location:

trunk/src/VBox/Devices/Network

Files:

• DevE1000.cpp (modified) (27 diffs)
• DevINIP.cpp (modified) (2 diffs)
• DevPCNet.cpp (modified) (13 diffs)
• DevVirtioNet.cpp (modified) (16 diffs)
• DrvNetSniffer.cpp (modified) (2 diffs)

trunk/src/VBox/Devices/Network/DevE1000.cpp

@@ -16 +16 @@
 
 /*
- * Copyright (C) 2007 Sun Microsystems, Inc.
+ * Copyright (C) 2007-2010 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -108 +108 @@
 
 #define INSTANCE(pState) pState->szInstance
-#define IFACE_TO_STATE(pIface, ifaceName) ((E1KSTATE *)((char*)pIface - RT_OFFSETOF(E1KSTATE, ifaceName)))
 #define STATE_TO_DEVINS(pState)           (((E1KSTATE *)pState)->CTX_SUFF(pDevIns))
 #define E1K_RELOCATE(p, o) *(RTHCUINTPTR *)&p += o
@@ -2598 +2597 @@
  *
  * @remarks Write into RDT forces switch to HC and signal to
- *          e1kWaitReceiveAvail().
+ *          e1kNetworkDown_WaitReceiveAvail().
  *
  * @returns VBox status code.
@@ -3121 +3120 @@
  *          a real ethernet wire.
  *
- * @param   pState      The device state structure.
+ * @param   pState              The device state structure.
+ * @param   fOnWorkerThread     Whether we're on a worker thread or an EMT.
  * @thread  E1000_TX
  */
-static void e1kTransmitFrame(E1KSTATE* pState)
+static void e1kTransmitFrame(E1KSTATE* pState, bool fOnWorkerThread)
 {
     PPDMSCATTERGATHER   pSg     = pState->pTxSgR3;
@@ -3181 +3181 @@
             e1kMutexRelease(pState);
             STAM_PROFILE_START(&pState->StatTransmitSend, a);
-            rc = pDrv->pfnSendBuf(pDrv, pSg, true /*fOnWorkerThread*/);
+            rc = pDrv->pfnSendBuf(pDrv, pSg, fOnWorkerThread);
             STAM_PROFILE_STOP(&pState->StatTransmitSend, a);
             e1kMutexAcquire(pState, VERR_SEM_BUSY, RT_SRC_POS);
@@ -3250 +3250 @@
  *          legacy.u64BufAddr.
  *
- * @param   pState      The device state structure.
- * @param   pDesc       Pointer to the descriptor to transmit.
- * @param   u16Len      Length of buffer to the end of segment.
- * @param   fSend       Force packet sending.
- * @param   pSgBuf      The current scatter gather buffer.
+ * @param   pState          The device state structure.
+ * @param   pDesc           Pointer to the descriptor to transmit.
+ * @param   u16Len          Length of buffer to the end of segment.
+ * @param   fSend           Force packet sending.
+ * @param   fOnWorkerThread Whether we're on a worker thread or an EMT.
  * @thread  E1000_TX
  */
-static void e1kFallbackAddSegment(E1KSTATE* pState, RTGCPHYS PhysAddr, uint16_t u16Len, bool fSend)
+static void e1kFallbackAddSegment(E1KSTATE* pState, RTGCPHYS PhysAddr, uint16_t u16Len, bool fSend, bool fOnWorkerThread)
 {
     /* TCP header being transmitted */
@@ -3353 +3353 @@
             pState->pTxSgR3->aSegs[0].cbSeg = pState->u16TxPktLen;
         }
-        e1kTransmitFrame(pState);
+        e1kTransmitFrame(pState, fOnWorkerThread);
 
         /* Update Sequence Number */
@@ -3372 +3372 @@
  * @returns true if the frame should be transmitted, false if not.
  *
- * @param   pState      The device state structure.
- * @param   pDesc       Pointer to the descriptor to transmit.
- * @param   cbFragment  Length of descriptor's buffer.
+ * @param   pState          The device state structure.
+ * @param   pDesc           Pointer to the descriptor to transmit.
+ * @param   cbFragment      Length of descriptor's buffer.
+ * @param   fOnWorkerThread Whether we're on a worker thread or an EMT.
  * @thread  E1000_TX
  */
-static bool e1kFallbackAddToFrame(E1KSTATE* pState, E1KTXDESC* pDesc, uint32_t cbFragment)
+static bool e1kFallbackAddToFrame(E1KSTATE* pState, E1KTXDESC* pDesc, uint32_t cbFragment, bool fOnWorkerThread)
 {
     PPDMSCATTERGATHER pTxSg = pState->pTxSgR3;
@@ -3399 +3400 @@
             /* This descriptor fits completely into current segment */
             cb = cbFragment;
-            e1kFallbackAddSegment(pState, pDesc->data.u64BufAddr, cb, pDesc->data.cmd.fEOP /*fSend*/);
+            e1kFallbackAddSegment(pState, pDesc->data.u64BufAddr, cb, pDesc->data.cmd.fEOP /*fSend*/, fOnWorkerThread);
         }
         else
         {
-            e1kFallbackAddSegment(pState, pDesc->data.u64BufAddr, cb, true /*fSend*/);
+            e1kFallbackAddSegment(pState, pDesc->data.u64BufAddr, cb, true /*fSend*/, fOnWorkerThread);
             /*
              * Rewind the packet tail pointer to the beginning of payload,
@@ -3545 +3546 @@
  * - context  sets up the context for following data descriptors.
  *
- * @param   pState      The device state structure.
- * @param   pDesc       Pointer to descriptor union.
- * @param   addr        Physical address of descriptor in guest memory.
+ * @param   pState          The device state structure.
+ * @param   pDesc           Pointer to descriptor union.
+ * @param   addr            Physical address of descriptor in guest memory.
+ * @param   fOnWorkerThread Whether we're on a worker thread or an EMT.
  * @thread  E1000_TX
  */
-static void e1kXmitDesc(E1KSTATE* pState, E1KTXDESC* pDesc, RTGCPHYS addr)
+static void e1kXmitDesc(E1KSTATE* pState, E1KTXDESC* pDesc, RTGCPHYS addr, bool fOnWorkerThread)
 {
     e1kPrintTDesc(pState, pDesc, "vvv");
@@ -3636 +3638 @@
                         && pState->pTxSgR3->cbUsed == (size_t)pState->contextTSE.dw3.u8HDRLEN + pState->contextTSE.dw2.u20PAYLEN)
                     {
-                        e1kTransmitFrame(pState);
+                        e1kTransmitFrame(pState, fOnWorkerThread);
                         E1K_INC_CNT32(TSCTC);
                     }
@@ -3670 +3672 @@
                                               pState->contextNormal.tu.u8CSS,
                                               pState->contextNormal.tu.u16CSE);
-                        e1kTransmitFrame(pState);
+                        e1kTransmitFrame(pState, fOnWorkerThread);
                     }
                     else
@@ -3680 +3682 @@
             {
                 STAM_COUNTER_INC(&pState->StatTxPathFallback);
-                e1kFallbackAddToFrame(pState, pDesc, pDesc->data.cmd.u20DTALEN);
+                e1kFallbackAddToFrame(pState, pDesc, pDesc->data.cmd.u20DTALEN, fOnWorkerThread);
             }
 
@@ -3714 +3716 @@
                 {
                     /** @todo Offload processing goes here. */
-                    e1kTransmitFrame(pState);
+                    e1kTransmitFrame(pState, fOnWorkerThread);
                     pState->u16TxPktLen = 0;
                 }
@@ -3743 +3745 @@
  *
  * @param   pState              The E1000 state.
- */
-static int e1kXmitPending(E1KSTATE *pState)
-{
-    PPDMINETWORKUP  pDrv = pState->pDrv;
-    int             rc;
+ * @param   fOnWorkerThread     Whether we're on a worker thread or on an EMT.
+ */
+static int e1kXmitPending(E1KSTATE *pState, bool fOnWorkerThread)
+{
+    int rc;
 
     /*
      * Grab the xmit lock of the driver as well as the E1K device state.
      */
+    PPDMINETWORKUP pDrv = pState->pDrv;
     if (pDrv)
     {
@@ -3772 +3775 @@
 
             e1kLoadDesc(pState, &desc, ((uint64_t)TDBAH << 32) + TDBAL + TDH * sizeof(desc));
-            e1kXmitDesc(pState, &desc, ((uint64_t)TDBAH << 32) + TDBAL + TDH * sizeof(desc));
+            e1kXmitDesc(pState, &desc, ((uint64_t)TDBAH << 32) + TDBAL + TDH * sizeof(desc), fOnWorkerThread);
             if (++TDH * sizeof(desc) >= TDLEN)
                 TDH = 0;
@@ -3797 +3800 @@
         pDrv->pfnEndXmit(pDrv);
     return rc;
+}
+
+/**
+ * @interface_method_impl{PDMINETWORKDOWN,pfnXmitPending}
+ */
+static DECLCALLBACK(void) e1kNetworkDown_XmitPending(PPDMINETWORKDOWN pInterface)
+{
+    E1KSTATE *pState = RT_FROM_MEMBER(pInterface, E1KSTATE, INetworkDown);
+    e1kXmitPending(pState, true /*fOnWorkerThread*/);
 }
 
@@ -3847 +3859 @@
         if (pThread->enmState == PDMTHREADSTATE_RUNNING)
         {
-            rc = e1kXmitPending(pState);
+            rc = e1kXmitPending(pState, true /*fOnWorkerThread*/);
             AssertMsgReturn(RT_SUCCESS(rc) || rc == VERR_TRY_AGAIN, ("%Rrc\n", rc), rc);
         }
@@ -4665 +4677 @@
 }
 
-static DECLCALLBACK(int) e1kWaitReceiveAvail(PPDMINETWORKDOWN pInterface, RTMSINTERVAL cMillies)
-{
-    E1KSTATE *pState = IFACE_TO_STATE(pInterface, INetworkDown);
+/**
+ * @interface_method_impl{PDMINETWORKDOWN,pfnWaitReceiveAvail}
+ */
+static DECLCALLBACK(int) e1kNetworkDown_WaitReceiveAvail(PPDMINETWORKDOWN pInterface, RTMSINTERVAL cMillies)
+{
+    E1KSTATE *pState = RT_FROM_MEMBER(pInterface, E1KSTATE, INetworkDown);
     int rc = e1kCanReceive(pState);
 
@@ -4688 +4703 @@
             break;
         }
-        E1kLogRel(("E1000 e1kWaitReceiveAvail: waiting cMillies=%u...\n",
+        E1kLogRel(("E1000 e1kNetworkDown_WaitReceiveAvail: waiting cMillies=%u...\n",
                 cMillies));
-        E1kLog(("%s e1kWaitReceiveAvail: waiting cMillies=%u...\n",
+        E1kLog(("%s e1kNetworkDown_WaitReceiveAvail: waiting cMillies=%u...\n",
                 INSTANCE(pState), cMillies));
         RTSemEventWait(pState->hEventMoreRxDescAvail, cMillies);
@@ -4863 +4878 @@
 
 /**
- * Receive data from the network.
- *
- * @returns VBox status code.
- * @param   pInterface      Pointer to the interface structure containing the called function pointer.
- * @param   pvBuf           The available data.
- * @param   cb              Number of bytes available in the buffer.
- * @thread  ???
- */
-static DECLCALLBACK(int) e1kReceive(PPDMINETWORKDOWN pInterface, const void *pvBuf, size_t cb)
-{
-    E1KSTATE *pState = IFACE_TO_STATE(pInterface, INetworkDown);
+ * @interface_method_impl{PDMINETWORKDOWN,pfnReceive}
+ */
+static DECLCALLBACK(int) e1kNetworkDown_Receive(PPDMINETWORKDOWN pInterface, const void *pvBuf, size_t cb)
+{
+    E1KSTATE *pState = RT_FROM_MEMBER(pInterface, E1KSTATE, INetworkDown);
     int       rc = VINF_SUCCESS;
 
@@ -4938 +4947 @@
 static DECLCALLBACK(int) e1kQueryStatusLed(PPDMILEDPORTS pInterface, unsigned iLUN, PPDMLED *ppLed)
 {
-    E1KSTATE *pState = IFACE_TO_STATE(pInterface, ILeds);
+    E1KSTATE *pState = RT_FROM_MEMBER(pInterface, E1KSTATE, ILeds);
     int       rc     = VERR_PDM_LUN_NOT_FOUND;
 
@@ -4959 +4968 @@
 static DECLCALLBACK(int) e1kGetMac(PPDMINETWORKCONFIG pInterface, PRTMAC pMac)
 {
-    E1KSTATE *pState = IFACE_TO_STATE(pInterface, INetworkConfig);
+    E1KSTATE *pState = RT_FROM_MEMBER(pInterface, E1KSTATE, INetworkConfig);
     pState->eeprom.getMac(pMac);
     return VINF_SUCCESS;
@@ -4974 +4983 @@
 static DECLCALLBACK(PDMNETWORKLINKSTATE) e1kGetLinkState(PPDMINETWORKCONFIG pInterface)
 {
-    E1KSTATE *pState = IFACE_TO_STATE(pInterface, INetworkConfig);
+    E1KSTATE *pState = RT_FROM_MEMBER(pInterface, E1KSTATE, INetworkConfig);
     if (STATUS & STATUS_LU)
         return PDMNETWORKLINKSTATE_UP;
@@ -4991 +5000 @@
 static DECLCALLBACK(int) e1kSetLinkState(PPDMINETWORKCONFIG pInterface, PDMNETWORKLINKSTATE enmState)
 {
-    E1KSTATE *pState = IFACE_TO_STATE(pInterface, INetworkConfig);
+    E1KSTATE *pState = RT_FROM_MEMBER(pInterface, E1KSTATE, INetworkConfig);
     bool fOldUp = !!(STATUS & STATUS_LU);
     bool fNewUp = enmState == PDMNETWORKLINKSTATE_UP;
@@ -5026 +5035 @@
 static DECLCALLBACK(void *) e1kQueryInterface(struct PDMIBASE *pInterface, const char *pszIID)
 {
-    E1KSTATE *pThis = IFACE_TO_STATE(pInterface, IBase);
+    E1KSTATE *pThis = RT_FROM_MEMBER(pInterface, E1KSTATE, IBase);
     Assert(&pThis->IBase == pInterface);
 
@@ -5698 +5707 @@
     /* Interfaces */
     pState->IBase.pfnQueryInterface          = e1kQueryInterface;
-    pState->INetworkDown.pfnWaitReceiveAvail = e1kWaitReceiveAvail;
-    pState->INetworkDown.pfnReceive          = e1kReceive;
+
+    pState->INetworkDown.pfnWaitReceiveAvail = e1kNetworkDown_WaitReceiveAvail;
+    pState->INetworkDown.pfnReceive          = e1kNetworkDown_Receive;
+    pState->INetworkDown.pfnXmitPending      = e1kNetworkDown_XmitPending;
+
     pState->ILeds.pfnQueryStatusLed          = e1kQueryStatusLed;
+
     pState->INetworkConfig.pfnGetMac         = e1kGetMac;
     pState->INetworkConfig.pfnGetLinkState   = e1kGetLinkState;

trunk/src/VBox/Devices/Network/DevINIP.cpp

@@ -385 +385 @@
 
 /**
- * @interface_method_impl{PDMINETWORKDOWN,pfnDoTransmitWork}
- */
-static DECLCALLBACK(void) devINIPNetworkDown_DoTransmitWork(PPDMINETWORKDOWN pInterface)
+ * @interface_method_impl{PDMINETWORKDOWN,pfnXmitPending}
+ */
+static DECLCALLBACK(void) devINIPNetworkDown_XmitPending(PPDMINETWORKDOWN pInterface)
 {
     NOREF(pInterface);
@@ -494 +494 @@
     pThis->INetworkDown.pfnWaitReceiveAvail = devINIPNetworkDown_WaitInputAvail;
     pThis->INetworkDown.pfnReceive          = devINIPNetworkDown_Input;
-    pThis->INetworkDown.pfnDoTransmitWork   = devINIPNetworkDown_DoTransmitWork;
+    pThis->INetworkDown.pfnXmitPending      = devINIPNetworkDown_XmitPending;
 
     /*

trunk/src/VBox/Devices/Network/DevPCNet.cpp

@@ -11 +11 @@
 
 /*
- * Copyright (C) 2006-2008 Sun Microsystems, Inc.
+ * Copyright (C) 2006-2010 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -2062 +2062 @@
 #ifndef VBOX_WITH_TX_THREAD_IN_NET_DEVICES
     /*
-     * Process as much as we can.
+     * Transmit as much as we can.
      */
-    int             rc   = VINF_SUCCESS;
-    PPDMINETWORKUP  pDrv = pThis->pDrvR3;
-    if (pDrv)
-    {
-        rc = pDrv->pfnBeginXmit(pDrv, false /*fOnWorkerThread*/);
-        AssertMsg(rc == VINF_SUCCESS || rc == VERR_TRY_AGAIN, ("%Rrc\n", rc));
-    }
-    if (RT_SUCCESS(rc))
-    {
-        rc = PDMCritSectEnter(&pThis->CritSect, VERR_SEM_BUSY);
-        if (RT_SUCCESS(rc))
-        {
-            int rc2 = pcnetAsyncTransmit(pThis, false /*fOnWorkerThread*/);
-            AssertReleaseRC(rc2);
-
-            PDMCritSectLeave(&pThis->CritSect);
-        }
-        else
-            AssertReleaseRC(rc);
-        if (pDrv)
-            pDrv->pfnEndXmit(pDrv);
-    }
+    pcnetXmitPending(pThis, true /*fOnWorkerThread*/);
 #else
     /*
@@ -2669 +2648 @@
 }
 
+
+/**
+ * Transmit pending descriptors.
+ *
+ * @returns VBox status code.  VERR_TRY_AGAIN is returned if we're busy.
+ *
+ * @param   pThis               The PCNet instance data.
+ * @param   fOnWorkerThread     Whether we're on a worker thread or on an EMT.
+ */
+static int pcnetXmitPending(PCNetState *pThis, bool fOnWorkerThread)
+{
+    int rc = VINF_SUCCESS;
+
+    /*
+     * Grab the xmit lock of the driver as well as the E1K device state.
+     */
+    PPDMINETWORKUP pDrv = pThis->pDrvR3;
+    if (pDrv)
+    {
+        rc = pDrv->pfnBeginXmit(pDrv, false /*fOnWorkerThread*/);
+        if (RT_FAILURE(rc))
+            return rc;
+    }
+    rc = PDMCritSectEnter(&pThis->CritSect, VERR_SEM_BUSY);
+    if (RT_SUCCESS(rc))
+    {
+        /** @todo check if we're supposed to suspend now. */
+        /*
+         * Do the transmitting.
+         */
+        int rc2 = pcnetAsyncTransmit(pThis, false /*fOnWorkerThread*/);
+        AssertReleaseRC(rc2);
+
+        /*
+         * Release the locks.
+         */
+        PDMCritSectLeave(&pThis->CritSect);
+    }
+    else
+        AssertLogRelRC(rc);
+    if (pDrv)
+        pDrv->pfnEndXmit(pDrv);
+
+    return rc;
+}
+
 #ifdef VBOX_WITH_TX_THREAD_IN_NET_DEVICES
 
@@ -2711 +2736 @@
 
         /*
-         * Perform async send. Mind that we might be requested to
-         * suspended while waiting for the critical sections.
+         * Perform async send.
          */
-        PPDMINETWORKUP pDrv = pThis->pDrvR3;
-        if (pDrv)
-        {
-            rc = pDrv->pfnBeginXmit(pDrv, true /*fOnWorkerThread*/);
-            if (rc == VERR_TRY_AGAIN)
-                continue;
-            AssertReleaseRCReturn(rc, rc);
-        }
-        rc = PDMCritSectEnter(&pThis->CritSect, VERR_SEM_BUSY);
-        if (RT_SUCCESS(rc))
-        {
-            if (pThread->enmState == PDMTHREADSTATE_RUNNING)
-            {
-                int rc2 = pcnetAsyncTransmit(pThis, true /*fOnWorkerThread*/);
-                AssertReleaseRC(rc2);
-            }
-
-            PDMCritSectLeave(&pThis->CritSect);
-        }
-        if (pDrv)
-            pDrv->pfnEndXmit(pDrv);
-        AssertReleaseRCReturn(rc, rc);
-    }
+        rc = pcnetXmitPending(pThis, true /*fOnWorkerThread*/);
+        AssertMsg(rc == VINF_SUCCESS || rc == VERR_TRY_AGAIN, ("%Rrc\n", rc));
+   }
 
     /* The thread is being suspended or terminated. */
@@ -4635 +4639 @@
 }
 
-/** Converts a pointer to PCNetState::INetworkDown to a PCNetState pointer. */
-#define INETWORKPORT_2_DATA(pInterface)  ( (PCNetState *)((uintptr_t)pInterface - RT_OFFSETOF(PCNetState, INetworkDown)) )
 
 
@@ -4674 +4676 @@
 
 /**
- *
- */
-static DECLCALLBACK(int) pcnetWaitReceiveAvail(PPDMINETWORKDOWN pInterface, RTMSINTERVAL cMillies)
-{
-    PCNetState *pThis = INETWORKPORT_2_DATA(pInterface);
+ * @interface_method_impl{PDMINETWORKDOWN,pfnWaitReceiveAvail}
+ */
+static DECLCALLBACK(int) pcnetNetworkDown_WaitReceiveAvail(PPDMINETWORKDOWN pInterface, RTMSINTERVAL cMillies)
+{
+    PCNetState *pThis = RT_FROM_MEMBER(pInterface, PCNetState, INetworkDown);
 
     int rc = pcnetCanReceive(pThis);
@@ -4699 +4701 @@
             break;
         }
-        LogFlow(("pcnetWaitReceiveAvail: waiting cMillies=%u...\n", cMillies));
+        LogFlow(("pcnetNetworkDown_WaitReceiveAvail: waiting cMillies=%u...\n", cMillies));
         /* Start the poll timer once which will remain active as long fMaybeOutOfSpace
          * is true -- even if (transmit) polling is disabled (CSR_DPOLL). */
@@ -4716 +4718 @@
 
 /**
- * Receive data from the network.
- *
- * @returns VBox status code.
- * @param   pInterface      Pointer to the interface structure containing the called function pointer.
- * @param   pvBuf           The available data.
- * @param   cb              Number of bytes available in the buffer.
- * @thread  EMT
- */
-static DECLCALLBACK(int) pcnetReceive(PPDMINETWORKDOWN pInterface, const void *pvBuf, size_t cb)
-{
-    PCNetState *pThis = INETWORKPORT_2_DATA(pInterface);
+ * @interface_method_impl{PDMINETWORKDOWN,pfnReceive}
+ */
+static DECLCALLBACK(int) pcnetNetworkDown_Receive(PPDMINETWORKDOWN pInterface, const void *pvBuf, size_t cb)
+{
+    PCNetState *pThis = RT_FROM_MEMBER(pInterface, PCNetState, INetworkDown);
     int         rc;
 
@@ -4771 +4767 @@
 }
 
-/** Converts a pointer to PCNetState::INetworkConfig to a PCNetState pointer. */
-#define INETWORKCONFIG_2_DATA(pInterface)  ( (PCNetState *)((uintptr_t)pInterface - RT_OFFSETOF(PCNetState, INetworkConfig)) )
+
+/**
+ * @interface_method_impl{PDMINETWORKDOWN,pfnXmitPending}
+ */
+static DECLCALLBACK(void) pcnetNetworkDown_XmitPending(PPDMINETWORKDOWN pInterface)
+{
+    PCNetState *pThis = RT_FROM_MEMBER(pInterface, PCNetState, INetworkDown);
+    pcnetXmitPending(pThis, true /*fOnWorkerThread*/);
+}
+
 
 
@@ -4785 +4789 @@
 static DECLCALLBACK(int) pcnetGetMac(PPDMINETWORKCONFIG pInterface, PRTMAC pMac)
 {
-    PCNetState *pThis = INETWORKCONFIG_2_DATA(pInterface);
+    PCNetState *pThis = RT_FROM_MEMBER(pInterface, PCNetState, INetworkConfig);
     memcpy(pMac, pThis->aPROM, sizeof(*pMac));
     return VINF_SUCCESS;
@@ -4800 +4804 @@
 static DECLCALLBACK(PDMNETWORKLINKSTATE) pcnetGetLinkState(PPDMINETWORKCONFIG pInterface)
 {
-    PCNetState *pThis = INETWORKCONFIG_2_DATA(pInterface);
+    PCNetState *pThis = RT_FROM_MEMBER(pInterface, PCNetState, INetworkConfig);
     if (pThis->fLinkUp && !pThis->fLinkTempDown)
         return PDMNETWORKLINKSTATE_UP;
@@ -4822 +4826 @@
 static DECLCALLBACK(int) pcnetSetLinkState(PPDMINETWORKCONFIG pInterface, PDMNETWORKLINKSTATE enmState)
 {
-    PCNetState *pThis = INETWORKCONFIG_2_DATA(pInterface);
+    PCNetState *pThis = RT_FROM_MEMBER(pInterface, PCNetState, INetworkConfig);
     bool fLinkUp;
     if (    enmState != PDMNETWORKLINKSTATE_DOWN
@@ -5151 +5155 @@
     pThis->IBase.pfnQueryInterface          = pcnetQueryInterface;
     /* INeworkPort */
-    pThis->INetworkDown.pfnWaitReceiveAvail = pcnetWaitReceiveAvail;
-    pThis->INetworkDown.pfnReceive          = pcnetReceive;
+    pThis->INetworkDown.pfnWaitReceiveAvail = pcnetNetworkDown_WaitReceiveAvail;
+    pThis->INetworkDown.pfnReceive          = pcnetNetworkDown_Receive;
+    pThis->INetworkDown.pfnXmitPending      = pcnetNetworkDown_XmitPending;
     /* INetworkConfig */
     pThis->INetworkConfig.pfnGetMac         = pcnetGetMac;

trunk/src/VBox/Devices/Network/DevVirtioNet.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2009 Sun Microsystems, Inc.
+ * Copyright (C) 2009-2010 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -38 +38 @@
 
 #define INSTANCE(pState) pState->VPCI.szInstance
-#define IFACE_TO_STATE(pIface, ifaceName) \
-        ((VNETSTATE *)((char*)pIface - RT_OFFSETOF(VNETSTATE, ifaceName)))
 #define STATUS pState->config.uStatus
 
@@ -543 +541 @@
 }
 
-static DECLCALLBACK(int) vnetWaitReceiveAvail(PPDMINETWORKDOWN pInterface, RTMSINTERVAL cMillies)
-{
-    VNETSTATE *pState = IFACE_TO_STATE(pInterface, INetworkDown);
-    LogFlow(("%s vnetWaitReceiveAvail(cMillies=%u)\n", INSTANCE(pState), cMillies));
+/**
+ * @interface_method_impl{PDMINETWORKDOWN,pfnWaitReceiveAvail}
+ */
+static DECLCALLBACK(int) vnetNetworkDown_WaitReceiveAvail(PPDMINETWORKDOWN pInterface, RTMSINTERVAL cMillies)
+{
+    VNETSTATE *pState = RT_FROM_MEMBER(pInterface, VNETSTATE, INetworkDown);
+    LogFlow(("%s vnetNetworkDown_WaitReceiveAvail(cMillies=%u)\n", INSTANCE(pState), cMillies));
     int rc = vnetCanReceive(pState);
 
@@ -568 +569 @@
             break;
         }
-        Log(("%s vnetWaitReceiveAvail: waiting cMillies=%u...\n",
+        Log(("%s vnetNetworkDown_WaitReceiveAvail: waiting cMillies=%u...\n",
                 INSTANCE(pState), cMillies));
         RTSemEventWait(pState->hEventMoreRxDescAvail, cMillies);
@@ -575 +576 @@
     ASMAtomicXchgBool(&pState->fMaybeOutOfSpace, false);
 
-    LogFlow(("%s vnetWaitReceiveAvail -> %d\n", INSTANCE(pState), rc));
+    LogFlow(("%s vnetNetworkDown_WaitReceiveAvail -> %d\n", INSTANCE(pState), rc));
     return rc;
 }
@@ -585 +586 @@
 static DECLCALLBACK(void *) vnetQueryInterface(struct PDMIBASE *pInterface, const char *pszIID)
 {
-    VNETSTATE *pThis = IFACE_TO_STATE(pInterface, VPCI.IBase);
+    VNETSTATE *pThis = RT_FROM_MEMBER(pInterface, VNETSTATE, VPCI.IBase);
     Assert(&pThis->VPCI.IBase == pInterface);
 
@@ -722 +723 @@
 
 /**
- * Receive data from the network.
- *
- * @returns VBox status code.
- * @param   pInterface      Pointer to the interface structure containing the called function pointer.
- * @param   pvBuf           The available data.
- * @param   cb              Number of bytes available in the buffer.
- * @thread  RX
- */
-static DECLCALLBACK(int) vnetReceive(PPDMINETWORKDOWN pInterface, const void *pvBuf, size_t cb)
-{
-    VNETSTATE *pState = IFACE_TO_STATE(pInterface, INetworkDown);
-
-    Log2(("%s vnetReceive: pvBuf=%p cb=%u\n", INSTANCE(pState), pvBuf, cb));
+ * @interface_method_impl{PDMINETWORKDOWN,pfnReceive}
+ */
+static DECLCALLBACK(int) vnetNetworkDown_Receive(PPDMINETWORKDOWN pInterface, const void *pvBuf, size_t cb)
+{
+    VNETSTATE *pState = RT_FROM_MEMBER(pInterface, VNETSTATE, INetworkDown);
+
+    Log2(("%s vnetNetworkDown_Receive: pvBuf=%p cb=%u\n", INSTANCE(pState), pvBuf, cb));
     int rc = vnetCanReceive(pState);
     if (RT_FAILURE(rc))
@@ -773 +768 @@
 static DECLCALLBACK(int) vnetGetMac(PPDMINETWORKCONFIG pInterface, PRTMAC pMac)
 {
-    VNETSTATE *pState = IFACE_TO_STATE(pInterface, INetworkConfig);
+    VNETSTATE *pState = RT_FROM_MEMBER(pInterface, VNETSTATE, INetworkConfig);
     memcpy(pMac, pState->config.mac.au8, sizeof(RTMAC));
     return VINF_SUCCESS;
@@ -787 +782 @@
 static DECLCALLBACK(PDMNETWORKLINKSTATE) vnetGetLinkState(PPDMINETWORKCONFIG pInterface)
 {
-    VNETSTATE *pState = IFACE_TO_STATE(pInterface, INetworkConfig);
+    VNETSTATE *pState = RT_FROM_MEMBER(pInterface, VNETSTATE, INetworkConfig);
     if (STATUS & VNET_S_LINK_UP)
         return PDMNETWORKLINKSTATE_UP;
@@ -803 +798 @@
 static DECLCALLBACK(int) vnetSetLinkState(PPDMINETWORKCONFIG pInterface, PDMNETWORKLINKSTATE enmState)
 {
-    VNETSTATE *pState = IFACE_TO_STATE(pInterface, INetworkConfig);
+    VNETSTATE *pState = RT_FROM_MEMBER(pInterface, VNETSTATE, INetworkConfig);
     bool fOldUp = !!(STATUS & VNET_S_LINK_UP);
     bool fNewUp = enmState == PDMNETWORKLINKSTATE_UP;
@@ -834 +829 @@
 }
 
-static DECLCALLBACK(void) vnetTransmitPendingPackets(PVNETSTATE pState, PVQUEUE pQueue, bool fOnWorkerThread)
+static void vnetTransmitPendingPackets(PVNETSTATE pState, PVQUEUE pQueue, bool fOnWorkerThread)
 {
     /*
@@ -926 +921 @@
 }
 
+/**
+ * @interface_method_impl{PDMINETWORKDOWN,pfnXmitPending}
+ */
+static DECLCALLBACK(void) vnetNetworkDown_XmitPending(PPDMINETWORKDOWN pInterface)
+{
+    VNETSTATE *pThis = RT_FROM_MEMBER(pInterface, VNETSTATE, INetworkDown);
+    vnetTransmitPendingPackets(pThis, pThis->pTxQueue, false /*fOnWorkerThread*/);
+}
+
 #ifdef VNET_TX_DELAY
+
 static DECLCALLBACK(void) vnetQueueTransmit(void *pvState, PVQUEUE pQueue)
 {
@@ -995 +1000 @@
 
 #else /* !VNET_TX_DELAY */
+
 static DECLCALLBACK(void) vnetQueueTransmit(void *pvState, PVQUEUE pQueue)
 {
@@ -1001 +1007 @@
     vnetTransmitPendingPackets(pState, pQueue, false /*fOnWorkerThread*/);
 }
+
 #endif /* !VNET_TX_DELAY */
 
@@ -1307 +1314 @@
 }
 
-/* Takes down the link temporarily if it's current status is up.
+/**
+ * Takes down the link temporarily if it's current status is up.
  *
  * This is used during restore and when replumbing the network link.
@@ -1693 +1701 @@
 
     /* Interfaces */
-    pState->INetworkDown.pfnWaitReceiveAvail = vnetWaitReceiveAvail;
-    pState->INetworkDown.pfnReceive          = vnetReceive;
+    pState->INetworkDown.pfnWaitReceiveAvail = vnetNetworkDown_WaitReceiveAvail;
+    pState->INetworkDown.pfnReceive          = vnetNetworkDown_Receive;
+    pState->INetworkDown.pfnXmitPending      = vnetNetworkDown_XmitPending;
+
     pState->INetworkConfig.pfnGetMac         = vnetGetMac;
     pState->INetworkConfig.pfnGetLinkState   = vnetGetLinkState;

trunk/src/VBox/Devices/Network/DrvNetSniffer.cpp

@@ -229 +229 @@
 
 /**
- * @interface_method_impl{PDMINETWORKDOWN,pfnDoTransmitWork}
- */
-static DECLCALLBACK(void) drvNetSnifferDown_DoTransmitWork(PPDMINETWORKDOWN pInterface)
+ * @interface_method_impl{PDMINETWORKDOWN,pfnXmitPending}
+ */
+static DECLCALLBACK(void) drvNetSnifferDown_XmitPending(PPDMINETWORKDOWN pInterface)
 {
     PDRVNETSNIFFER pThis = RT_FROM_MEMBER(pInterface, DRVNETSNIFFER, INetworkDown);
-    pThis->pIAboveNet->pfnDoTransmitWork(pThis->pIAboveNet);
+    pThis->pIAboveNet->pfnXmitPending(pThis->pIAboveNet);
 }
 
@@ -400 +400 @@
     pThis->INetworkDown.pfnWaitReceiveAvail         = drvNetSnifferDown_WaitReceiveAvail;
     pThis->INetworkDown.pfnReceive                  = drvNetSnifferDown_Receive;
-    pThis->INetworkDown.pfnDoTransmitWork           = drvNetSnifferDown_DoTransmitWork;
+    pThis->INetworkDown.pfnXmitPending              = drvNetSnifferDown_XmitPending;
     /* INetworkConfig */
     pThis->INetworkConfig.pfnGetMac                 = drvNetSnifferDownCfg_GetMac;