Changeset 27825 in vbox

Timestamp:

Mar 30, 2010 1:32:40 PM (15 years ago)

Author:

vboxsync

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

59498

Message:

DevPCNet.cpp: Removed the experimental PCNET_QUEUE_SEND_PACKETS code.

File:

• trunk/src/VBox/Devices/Network/DevPCNet.cpp (modified) (10 diffs)

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

@@ -78 +78 @@
 /* Enable to handle frequent io reads in the guest context (recommended) */
 #define PCNET_GC_ENABLED
-
-/* Experimental: queue TX packets */
-//#define PCNET_QUEUE_SEND_PACKETS
 
 #if defined(LOG_ENABLED)
@@ -278 +275 @@
     bool                                fAm79C973;
     uint32_t                            u32LinkSpeed;
-
-#ifdef PCNET_QUEUE_SEND_PACKETS
-# define PCNET_MAX_XMIT_SLOTS           128
-# define PCNET_MAX_XMIT_SLOTS_MASK      (PCNET_MAX_XMIT_SLOTS - 1)
-
-    uint32_t                            iXmitRingBufProd;
-    uint32_t                            iXmitRingBufCons;
-    /** @todo XXX currently atomic operations on this variable are overkill */
-    volatile int32_t                    cXmitRingBufPending;
-    uint16_t                            cbXmitRingBuffer[PCNET_MAX_XMIT_SLOTS];
-    R3PTRTYPE(uint8_t *)                apXmitRingBuffer[PCNET_MAX_XMIT_SLOTS];
-#endif
 
     STAMCOUNTER                         StatReceiveBytes;
@@ -623 +608 @@
         (R)->rmd2.zeros))
 
-#if defined(PCNET_QUEUE_SEND_PACKETS) && defined(IN_RING3)
-static int pcnetSyncTransmit(PCNetState *pThis);
-#endif
 static void pcnetPollTimerStart(PCNetState *pThis);
 
@@ -2082 +2064 @@
     /* Clear counter .*/
     ASMAtomicAndU32(&pThis->cPendingSends, 0);
-#ifdef PCNET_QUEUE_SEND_PACKETS
-    int rc = PDMCritSectEnter(&pThis->CritSect, VERR_SEM_BUSY);
-    AssertReleaseRC(rc);
-    pcnetSyncTransmit(pThis);
-    PDMCritSectLeave(&pThis->CritSect);
-#else
     int rc = RTSemEventSignal(pThis->hSendEventSem);
     AssertRC(rc);
-#endif
     return true;
 }
@@ -2114 +2089 @@
     Assert(cbFrame < sizeof(pThis->abSendBuf));
 
-#ifdef PCNET_QUEUE_SEND_PACKETS
-    AssertRelease(pThis->cXmitRingBufPending < PCNET_MAX_XMIT_SLOTS-1);
-    pThis->pvSendFrame = pThis->apXmitRingBuffer[pThis->iXmitRingBufProd];
-#else
     pThis->pvSendFrame = pThis->abSendBuf;
-#endif
     PDMDevHlpPhysRead(pThis->CTX_SUFF(pDevIns), GCPhysFrame, pThis->pvSendFrame, cbFrame);
     pThis->cbSendFrame = cbFrame;
@@ -2142 +2112 @@
 DECLINLINE(int) pcnetXmitCompleteFrame(PCNetState *pThis)
 {
-#ifdef PCNET_QUEUE_SEND_PACKETS
-    Assert(PDMCritSectIsOwner(&pThis->CritSect));
-    AssertRelease(pThis->cXmitRingBufPending < PCNET_MAX_XMIT_SLOTS-1);
-    Assert(!pThis->cbXmitRingBuffer[pThis->iXmitRingBufProd]);
-
-    pThis->cbXmitRingBuffer[pThis->iXmitRingBufProd] = (uint16_t)pThis->cbSendFrame;
-    pThis->iXmitRingBufProd = (pThis->iXmitRingBufProd+1) & PCNET_MAX_XMIT_SLOTS_MASK;
-    ASMAtomicIncS32(&pThis->cXmitRingBufPending);
-
-    int rc = RTSemEventSignal(pThis->hSendEventSem);
-    AssertRC(rc);
-
-    return VINF_SUCCESS;
-#else
     /* Don't hold the critical section while transmitting data. */
     /** @note also avoids deadlocks with NAT as it can call us right back. */
@@ -2170 +2126 @@
 
     return PDMCritSectEnter(&pThis->CritSect, VERR_SEM_BUSY);
-#endif
 }
 
@@ -2280 +2235 @@
  * Try to transmit frames
  */
-#ifdef PCNET_QUEUE_SEND_PACKETS
 static int pcnetAsyncTransmit(PCNetState *pThis)
-{
-    Assert(PDMCritSectIsOwner(&pThis->CritSect));
-    size_t cb;
-
-    while ((pThis->cXmitRingBufPending > 0))
-    {
-        cb = pThis->cbXmitRingBuffer[pThis->iXmitRingBufCons];
-
-        /* Don't hold the critical section while transmitting data. */
-        /** @note also avoids deadlocks with NAT as it can call us right back. */
-        PDMCritSectLeave(&pThis->CritSect);
-
-        STAM_PROFILE_ADV_START(&pThis->StatTransmitSend, a);
-        if (cb > 70) /* unqualified guess */
-            pThis->Led.Asserted.s.fWriting = pThis->Led.Actual.s.fWriting = 1;
-
-        pThis->pDrv->pfnSend(pThis->pDrv, pThis->apXmitRingBuffer[pThis->iXmitRingBufCons], cb);
-        STAM_REL_COUNTER_ADD(&pThis->StatTransmitBytes, cb);
-        pThis->Led.Actual.s.fWriting = 0;
-        STAM_PROFILE_ADV_STOP(&pThis->StatTransmitSend, a);
-
-        int rc = PDMCritSectEnter(&pThis->CritSect, VERR_SEM_BUSY);
-        AssertReleaseRC(rc);
-
-        pThis->cbXmitRingBuffer[pThis->iXmitRingBufCons] = 0;
-        pThis->iXmitRingBufCons = (pThis->iXmitRingBufCons+1) & PCNET_MAX_XMIT_SLOTS_MASK;
-        ASMAtomicDecS32(&pThis->cXmitRingBufPending);
-    }
-    return VINF_SUCCESS;
-}
-
-static int pcnetSyncTransmit(PCNetState *pThis)
-#else
-static int pcnetAsyncTransmit(PCNetState *pThis)
-#endif
 {
     unsigned cFlushIrq = 0;
@@ -4922 +4841 @@
         PDMR3CritSectDelete(&pThis->CritSect);
     }
-#ifdef PCNET_QUEUE_SEND_PACKETS
-    if (pThis->apXmitRingBuffer)
-        RTMemFree(pThis->apXmitRingBuffer[0]);
-#endif
     return VINF_SUCCESS;
 }
@@ -5222 +5137 @@
     rc = PDMDevHlpThreadCreate(pDevIns, &pThis->pSendThread, pThis, pcnetAsyncSendThread, pcnetAsyncSendThreadWakeUp, 0, RTTHREADTYPE_IO, "PCNET_TX");
     AssertRCReturn(rc, rc);
-
-#ifdef PCNET_QUEUE_SEND_PACKETS
-    pThis->apXmitRingBuffer[0] = (uint8_t *)RTMemAlloc(PCNET_MAX_XMIT_SLOTS * MAX_FRAME);
-    for (unsigned i = 1; i < PCNET_MAX_XMIT_SLOTS; i++)
-        pThis->apXmitRingBuffer[i] = pThis->apXmitRingBuffer[0] + i*MAX_FRAME;
-#endif
 
 #ifdef VBOX_WITH_STATISTICS