Changeset 22160 in vbox for trunk/src/VBox/Devices/Network

Timestamp:

Aug 11, 2009 11:55:43 AM (15 years ago)

Author:

vboxsync

Message:

NAT: splitting PDM consumer to serve slirp_can_output and slirp_output

File:

• trunk/src/VBox/Devices/Network/DrvNAT.cpp (modified) (9 diffs)

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

@@ -148 +148 @@
     /* Send queue */
     PPDMQUEUE               pSendQueue;
+
+    RTSEMEVENT semStatus;
 #ifdef VBOX_WITH_SLIRP_MT
     PPDMTHREAD              pGuestThread;
@@ -169 +171 @@
  * NAT queue item.
  */
+typedef enum SLIRP_EVENT {SLIRP_CHECK, SLIRP_SEND} SLIRP_EVENT;
 typedef struct DRVNATQUEUITEM
 {
     /** The core part owned by the queue manager. */
     PDMQUEUEITEMCORE    Core;
+    SLIRP_EVENT enmType;
+    int *pStatus;
     /** The buffer for output to guest. */
     const uint8_t       *pu8Buf;
@@ -275 +280 @@
     /* nothing to do */
 }
-
 
 /**
@@ -533 +537 @@
 int slirp_can_output(void *pvUser)
 {
+    int status = 0;
+    int rc = 0;
     PDRVNAT pThis = (PDRVNAT)pvUser;
 
-    Assert(pThis);
-    return 1;
+    PDRVNATQUEUITEM pItem = (PDRVNATQUEUITEM)PDMQueueAlloc(pThis->pSendQueue);
+    if (pItem)
+    {
+        pItem->enmType = SLIRP_CHECK;
+        pItem->pStatus = &status;
+        PDMQueueInsert(pThis->pSendQueue, &pItem->Core);
+        rc = RTSemEventWait(pThis->semStatus, RT_INDEFINITE_WAIT); 
+        AssertRC(rc);
+        return status;
+    }
+    return 0;
 }
 
@@ -560 +575 @@
     if (pItem)
     {
+        pItem->enmType = SLIRP_SEND;
         pItem->pu8Buf = pu8Buf;
         pItem->cb = cb;
@@ -591 +607 @@
 static DECLCALLBACK(bool) drvNATQueueConsumer(PPDMDRVINS pDrvIns, PPDMQUEUEITEMCORE pItemCore)
 {
+    int rc;
     PDRVNAT pThis = PDMINS_2_DATA(pDrvIns, PDRVNAT);
     PDRVNATQUEUITEM pItem = (PDRVNATQUEUITEM)pItemCore;
@@ -596 +613 @@
     Log(("drvNATQueueConsumer(pItem:%p, pu8Buf:%p, cb:%d)\n", pItem, pItem->pu8Buf, pItem->cb));
     Log2(("drvNATQueueConsumer: pu8Buf:\n%.Rhxd\n", pItem->pu8Buf));
-    int rc = pThis->pPort->pfnWaitReceiveAvail(pThis->pPort, 0);
-    if (RT_FAILURE(rc))
-        return false;
-    rc = pThis->pPort->pfnReceive(pThis->pPort, pItem->pu8Buf, pItem->cb);
+    switch (pItem->enmType) {
+        case SLIRP_SEND:
+            rc = pThis->pPort->pfnReceive(pThis->pPort, pItem->pu8Buf, pItem->cb);
+            RTMemFree((void *)pItem->pu8Buf);
+            break;
+        case SLIRP_CHECK:
+            
+            *pItem->pStatus = (RT_SUCCESS(pThis->pPort->pfnWaitReceiveAvail(pThis->pPort, 0))? 1 : 0);
+             rc = RTSemEventSignal(pThis->semStatus);
+             AssertRC(rc);
+            break;
+    }
+    return true;
 
 #if 0
@@ -613 +639 @@
     /*Copy buffer again, till seeking good way of syncronization with slirp mbuf management code*/
     AssertRelease(pItem->mbuf == NULL);
-    RTMemFree((void *)pItem->pu8Buf);
 #endif
     return RT_SUCCESS(rc);
@@ -937 +962 @@
                 return rc;
             }
+
+            rc = RTSemEventCreate(&pThis->semStatus);
+            AssertRC(rc);
 
 #ifndef RT_OS_WINDOWS