Changeset 642 in vbox for trunk/src/VBox/Devices

Timestamp:

Feb 5, 2007 4:10:45 PM (18 years ago)

Author:

vboxsync

Message:

Some async updates

File:

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

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

@@ -239 +239 @@
     PRTREQQUEUE                         pSendQueue;
     RTTHREAD                            hSendThread;
+
+    struct
+    {
+        HCPTRTYPE(void *)               pBuffer;
+        uint32_t                        cb;
+        uint32_t                        fTaken;
+    } paMemCache[PCNET_TRQUEUE_DEPTH];
 #endif
 
@@ -308 +315 @@
     STAMCOUNTER                         StatXmitAsync;
     STAMCOUNTER                         StatXmitInTxThread;
-    STAMPROFILE                         StatXmitQueueAsync;
+    STAMPROFILE                         StatXmitQueueAsyncPrep;
+    STAMPROFILE                         StatXmitQueueAsyncReq;
+    STAMCOUNTER                         StatXmitQueueAsyncCacheMiss;
+    STAMCOUNTER                         StatXmitQueueAsyncCacheHit;
 #endif /* VBOX_WITH_STATISTICS */
 };
@@ -1800 +1810 @@
  *  Send packet(s) to the network driver.
  */
-static DECLCALLBACK(void) pcnetSendAsyncPacket(PCNetState *pData, unsigned cFrames, uint32_t *pacbFrame, uint8_t *pBuf)
+static DECLCALLBACK(void) pcnetSendAsyncPacket(PCNetState *pData, unsigned iCacheSlot, unsigned cFrames, uint32_t *pacbFrame, uint8_t *pBuf)
 { 
     Assert(pData && pData->pDrv && pData->pDrv->pfnSend);
@@ -1810 +1820 @@
         pBuf += RT_ALIGN_32(pacbFrame[i], 16);
     }
-    RTMemFree(pacbFrame);
+    if (iCacheSlot < ELEMENTS(pData->paMemCache))
+    {
+        pData->paMemCache[iCacheSlot].fTaken = 0;
+    }
+    else
+        RTMemFree(pacbFrame);
+
+#ifdef PCNET_DELAY_INT
+    if (cFrames)
+    {
+        /** @note this part needs to be protected; perhaps we can change the code to drop this requirement. */
+        int rc = PDMCritSectEnter(&pData->CritSect, VERR_PERMISSION_DENIED);
+        AssertReleaseRC(rc);
+
+        /* Update TXSTRT and TINT. */
+        pData->aCSR[4] |=  0x0004;       /* set TXSTRT */
+        pData->aCSR[0] |= 0x0200;    /* set TINT */
+        pcnetUpdateIrq(pData);
+
+        PDMCritSectLeave(&pData->CritSect);
+    }
+#endif
 }
 # endif
@@ -1846 +1877 @@
     {
         uint32_t        cbTotal = 0;
-        uint32_t       *pacbFrame;
+        uint32_t       *pacbFrame = 0;
         uint8_t        *pBuf;
-
-        STAM_PROFILE_START(&pData->StatXmitQueueAsync, b);
-        for (unsigned i = 0; i < pData->iFrame; i++)
+        unsigned        i, iCacheSlot = ~0;
+
+        STAM_PROFILE_START(&pData->StatXmitQueueAsyncPrep, b);
+        for (i = 0; i < pData->iFrame; i++)
             cbTotal += RT_ALIGN_32(pData->aFrames[i].cb, 16);
 
-        pacbFrame = (uint32_t *)RTMemAlloc(cbTotal + sizeof(uint32_t) * pData->iFrame);
+        /* Plus room for size array */
+        cbTotal += sizeof(uint32_t) * pData->iFrame;
+
+        /* See if there's a free cache entry. */
+        for (i=0;i<ELEMENTS(pData->paMemCache);i++)
+        {
+            if (    pData->paMemCache[i].cb >= cbTotal
+                && !pData->paMemCache[i].fTaken)
+            {
+                pData->paMemCache[i].fTaken = 1;
+                pacbFrame  = (uint32_t *)pData->paMemCache[i].pBuffer;
+                iCacheSlot = i;
+                break;
+            }
+        }
+        if (!pacbFrame)
+        {
+            STAM_COUNTER_INC(&pData->StatXmitQueueAsyncCacheMiss);
+            pacbFrame = (uint32_t *)RTMemAlloc(cbTotal);
+        }
+        else
+            STAM_COUNTER_INC(&pData->StatXmitQueueAsyncCacheHit);
+
         Assert(pacbFrame);
         pBuf     = (uint8_t *)&pacbFrame[pData->iFrame];
@@ -1874 +1928 @@
             LOG_PACKET("xmit", pv, pData->aFrames[i].cb);
         }
+        STAM_PROFILE_STOP(&pData->StatXmitQueueAsyncPrep, b);
+        STAM_PROFILE_START(&pData->StatXmitQueueAsyncReq, c);
         if (pcnetIsLinkUp(pData))
         {
             pBuf = (uint8_t *)&pacbFrame[pData->iFrame];
 
-            rc = RTReqCallEx(pData->pSendQueue, NULL, 0, RTREQFLAGS_NO_WAIT | RTREQFLAGS_VOID, (PFNRT)pcnetSendAsyncPacket, 4, pData, pData->iFrame, pacbFrame, pBuf);
+            rc = RTReqCallEx(pData->pSendQueue, NULL, 0, RTREQFLAGS_NO_WAIT | RTREQFLAGS_VOID, (PFNRT)pcnetSendAsyncPacket, 5, pData, iCacheSlot, pData->iFrame, pacbFrame, pBuf);
             AssertRC(rc);
         }
-        STAM_PROFILE_STOP(&pData->StatXmitQueueAsync, b);
+        STAM_PROFILE_STOP(&pData->StatXmitQueueAsyncReq, c);
     }
 #else
@@ -1898 +1954 @@
         }
     }
-#endif /* PCNET_ASYNC_SEND */
-
 #ifdef PCNET_DELAY_INT
     if (pData->iFrame)
@@ -1915 +1969 @@
     }
 #endif
+
+#endif /* PCNET_ASYNC_SEND */
 
     pData->fTransmitting = false;
@@ -4323 +4379 @@
 
     Assert(pData->hSendThread != NIL_RTTHREAD && pData->pSendQueue);
+
+    /* Create some buffer memory to avoid allocating every time we process an async send packet. */
+    for (unsigned j=0;j<ELEMENTS(pData->paMemCache);j++)
+    {
+        pData->paMemCache[j].cb      = sizeof(pData->abFrameBuf) + sizeof(uint32_t) * ELEMENTS(pData->abFrameBuf);
+        pData->paMemCache[j].fTaken  = 0;
+        pData->paMemCache[j].pBuffer = RTMemAlloc(pData->paMemCache[j].cb);
+        Assert(pData->paMemCache[j].pBuffer);
+    }
 #endif
 
@@ -4350 +4415 @@
     PDMDevHlpSTAMRegisterF(pDevIns, &pData->StatXmitQueue,          STAMTYPE_PROFILE, STAMVISIBILITY_ALWAYS, STAMUNIT_TICKS_PER_CALL, "Profiling PCNet xmit queue",         "/Devices/PCNet%d/XmitQueue", iInstance);
     PDMDevHlpSTAMRegisterF(pDevIns, &pData->StatXmitQueueFlushGC,   STAMTYPE_PROFILE, STAMVISIBILITY_ALWAYS, STAMUNIT_TICKS_PER_CALL, "Profiling PCNet xmit queue flushes from GC", "/Devices/PCNet%d/XmitQueueFlushGC", iInstance);
-    PDMDevHlpSTAMRegisterF(pDevIns, &pData->StatXmitQueueAsync,     STAMTYPE_PROFILE, STAMVISIBILITY_ALWAYS, STAMUNIT_TICKS_PER_CALL, "Profiling PCNet xmit queue async",   "/Devices/PCNet%d/XmitQueueAsync", iInstance);
+    PDMDevHlpSTAMRegisterF(pDevIns, &pData->StatXmitQueueAsyncPrep, STAMTYPE_PROFILE, STAMVISIBILITY_ALWAYS, STAMUNIT_TICKS_PER_CALL, "Profiling PCNet xmit queue async",   "/Devices/PCNet%d/XmitQueueASPrep", iInstance);
+    PDMDevHlpSTAMRegisterF(pDevIns, &pData->StatXmitQueueAsyncReq,  STAMTYPE_PROFILE, STAMVISIBILITY_ALWAYS, STAMUNIT_TICKS_PER_CALL, "Profiling PCNet xmit queue async",   "/Devices/PCNet%d/XmitQueueASReq", iInstance);
+
+    PDMDevHlpSTAMRegisterF(pDevIns, &pData->StatXmitQueueAsyncCacheMiss, STAMTYPE_COUNTER, STAMVISIBILITY_ALWAYS, STAMUNIT_OCCURENCES,     "Nr asycn mem cache misses",     "/Devices/PCNet%d/Xmit/Cache/Miss", iInstance);
+    PDMDevHlpSTAMRegisterF(pDevIns, &pData->StatXmitQueueAsyncCacheHit,  STAMTYPE_COUNTER, STAMVISIBILITY_ALWAYS, STAMUNIT_OCCURENCES,     "Nr asycn mem cache hits",       "/Devices/PCNet%d/Xmit/Cache/Hit", iInstance);
 
     PDMDevHlpSTAMRegisterF(pDevIns, &pData->StatDeferredXmit,       STAMTYPE_COUNTER,  STAMVISIBILITY_ALWAYS, STAMUNIT_OCCURENCES,     "Nr of deferred xmits queue flushes", "/Devices/PCNet%d/Xmit/Deferred", iInstance);