Changeset 575 in vbox for trunk/src/VBox

Timestamp:

Feb 2, 2007 6:29:46 PM (18 years ago)

Author:

vboxsync

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

18195

Message:

Enabled delayed transmit interrupts + added async sending of packets (disabled)

Location:

trunk/src/VBox/Devices/Network

Files:

• DevPCNet.cpp (modified) (8 diffs)
• DrvTAPWin32.cpp (modified) (1 diff)

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

@@ -69 +69 @@
 #ifdef IN_RING3
 #include <iprt/mem.h>
+#include <iprt/semaphore.h>
 #endif
 
@@ -85 +86 @@
 /* Enable to delay setting the TX interrupt until packets have been sent. */
 /** @note currently not technically correct (own bit) */
-/* #define PCNET_DELAY_INT */
+#define PCNET_DELAY_INT
+
+/* Enable to send packets in a seperate thread. */
+/* #define PCNET_ASYNC_SEND */
 
 #ifdef __GNUC__
@@ -227 +231 @@
     /** Partner of ILeds. */
     HCPTRTYPE(PPDMILEDCONNECTORS)       pLedsConnector;
+
+#ifdef PCNET_ASYNC_SEND
+    /** Async send thread */
+    RTSEMEVENT                          hEventSemSend;
+    RTTHREAD                            hSendThread;
+#endif
 
     /** Access critical section. */
@@ -289 +299 @@
     STAMCOUNTER                         StatRingWriteOutsideRangeR0;
     STAMCOUNTER                         StatRingWriteOutsideRangeGC;
+# endif
+# ifdef PCNET_ASYNC_SEND
+    STAMCOUNTER                         StatSyncSend;
+    STAMCOUNTER                         StatAsyncSend;
 # endif
 #endif /* VBOX_WITH_STATISTICS */
@@ -1790 +1804 @@
     int         rc;
 
+#ifdef PCNET_ASYNC_SEND
+    /* If the calling threads isn't the async send thread and our queue isn't yet full, then kick off async sending. */
+    if (    pData->iFrame  != ELEMENTS(pData->aFrames)
+        &&  RTThreadSelf() != pData->hSendThread)
+    {
+        STAM_COUNTER_INC(&pData->StatAsyncSend);
+        rc = RTSemEventSignal(pData->hEventSemSend);
+        AssertRC(rc);
+        return VINF_SUCCESS;
+    }
+    if (RTThreadSelf() != pData->hSendThread)
+        STAM_COUNTER_INC(&pData->StatSyncSend);
+#endif /* PCNET_ASYNC_SEND */
+
     STAM_PROFILE_START(&pData->StatXmitQueue, a);
     STAM_COUNTER_INC(&pData->aStatFlushCounts[pData->iFrame]);
@@ -1890 +1918 @@
     return true;
 }
+
+#ifdef PCNET_ASYNC_SEND
+/**
+ * Async I/O thread for delayed sending of packets.
+ */
+static DECLCALLBACK(int) pcnetAsyncSend(RTTHREAD ThreadSelf, void *pvUser)
+{
+    PCNetState *pData = (PCNetState *)pvUser;
+    RTSEMEVENT  hEventSemSend = pData->hEventSemSend;
+
+    while(1)
+    {
+        int rc = RTSemEventWait(pData->hEventSemSend, RT_INDEFINITE_WAIT);
+        if (VBOX_FAILURE(rc))
+            break;
+
+        pcnetXmitQueueConsumer(PCNETSTATE_2_DEVINS(pData), NULL);
+    }
+    return VINF_SUCCESS;
+}
+#endif /* PCNET_ASYNC_SEND */
+
 #endif /* IN_RING3 */
 
@@ -1910 +1960 @@
 #endif
     }
+#ifndef PCNET_ASYNC_SEND
     pData->aFrames[0].off  = 0;
     pData->aFrames[0].cb   = -1;
     pData->aFrames[0].pvR3 = NIL_RTR3PTR;
     pData->iFrame = 0;
+#endif
 }
 
@@ -4208 +4260 @@
     pcnetHardReset(pData);
 
+#ifdef PCNET_ASYNC_SEND
+    /* Create event semaphore for the async send thread. */
+    rc = RTSemEventCreate(&pData->hEventSemSend);
+    AssertRC(rc);
+
+    /* Create asynchronous thread */
+    rc = RTThreadCreate(&pData->hSendThread, pcnetAsyncSend, (void *)pData, 128*1024, RTTHREADTYPE_IO, 0, "PCNET_SEND");
+    AssertRC(rc);
+
+    Assert(pData->hSendThread != NIL_RTTHREAD && pData->hEventSemSend != NIL_RTSEMEVENT);
+
+    PDMDevHlpSTAMRegisterF(pDevIns, &pData->StatAsyncSend,          STAMTYPE_COUNTER, STAMVISIBILITY_ALWAYS, STAMUNIT_OCCURENCES,     "Nr of async send operations",        "/Devices/PCNet%d/Send/Async", iInstance);
+    PDMDevHlpSTAMRegisterF(pDevIns, &pData->StatSyncSend,           STAMTYPE_COUNTER, STAMVISIBILITY_ALWAYS, STAMUNIT_OCCURENCES,     "Nr of sync send operations",         "/Devices/PCNet%d/Send/Sync", iInstance);
+#endif
+
 #ifdef VBOX_WITH_STATISTICS
     PDMDevHlpSTAMRegisterF(pDevIns, &pData->StatMMIOReadGC,         STAMTYPE_PROFILE, STAMVISIBILITY_ALWAYS, STAMUNIT_TICKS_PER_CALL, "Profiling MMIO reads in GC",         "/Devices/PCNet%d/MMIO/ReadGC", iInstance);

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

@@ -613 +613 @@
 
 #ifdef ASYNC_NETIO
+    pData->hHaltAsyncEventSem = CreateEvent(NULL, FALSE, FALSE, NULL);
+
     /* Create asynchronous thread */
     rc = RTThreadCreate(&pData->hThread, drvTAPW32AsyncIo, (void *)pData, 128*1024, RTTHREADTYPE_IO, 0, "TAPWIN32");
     AssertRC(rc);
-
-    pData->hHaltAsyncEventSem = CreateEvent(NULL, FALSE, FALSE, NULL);
 
     Assert(pData->hThread != NIL_RTTHREAD && pData->hHaltAsyncEventSem != NULL);