Changeset 22217 in vbox

Timestamp:

Aug 13, 2009 3:57:05 AM (16 years ago)

Author:

vboxsync

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

51018

Message:

NAT: remove RX-check via PDM Queue experiment

File:

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

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

@@ -62 +62 @@
 #define VBOX_NAT_DELAY_HACK
 #if 0
-#define SLIRP_CAN_SAND_IN_PDM 1
-#endif
 #define SLIRP_SPLIT_CAN_OUTPUT 1
+#endif
 
 #define GET_EXTRADATA(pthis, node, name, rc, type, type_name, var)                                  \
@@ -227 +226 @@
     /** 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;
@@ -592 +589 @@
 {
 #ifdef SLIRP_SPLIT_CAN_OUTPUT
-# ifdef SLIRP_CAN_SAND_IN_PDM
-    int status = 0;
-    int rc = 0;
-    PDRVNAT pThis = (PDRVNAT)pvUser;
-
-    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 & pThis->output_flag;
-    }
-    return 0;
-# else
-   PDRVNAT pThis = (PDRVNAT)pvUser;
    return pThis->output_flag;
-# endif
 #else
     return 1;
@@ -637 +615 @@
     if (pItem)
     {
-        pItem->enmType = SLIRP_SEND;
         pItem->pu8Buf = pu8Buf;
         pItem->cb = cb;
@@ -675 +652 @@
     Log(("drvNATQueueConsumer(pItem:%p, pu8Buf:%p, cb:%d)\n", pItem, pItem->pu8Buf, pItem->cb));
     Log2(("drvNATQueueConsumer: pu8Buf:\n%.Rhxd\n", pItem->pu8Buf));
-    switch (pItem->enmType) {
-        case SLIRP_SEND:
 #ifndef SLIRP_SPLIT_CAN_OUTPUT
-            if (RT_FAILURE(pThis->pPort->pfnWaitReceiveAvail(pThis->pPort, 0)))
-                return false;
-#endif
-            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;
-    }
+    if (RT_FAILURE(pThis->pPort->pfnWaitReceiveAvail(pThis->pPort, 0)))
+        return false;
+#endif
+    rc = pThis->pPort->pfnReceive(pThis->pPort, pItem->pu8Buf, pItem->cb);
+    RTMemFree((void *)pItem->pu8Buf);
     return true;
 
-#if 0
-    rc = RTReqAlloc(pThis->pReqQueue, &pReq, RTREQTYPE_INTERNAL);
-    AssertReleaseRC(rc);
-    pReq->u.Internal.pfn      = (PFNRT)slirp_post_sent;
-    pReq->u.Internal.cArgs    = 2;
-    pReq->u.Internal.aArgs[0] = (uintptr_t)pThis->pNATState;
-    pReq->u.Internal.aArgs[1] = (uintptr_t)pItem->mbuf;
-    pReq->fFlags              = RTREQFLAGS_VOID;
-    AssertRC(rc);
-#else
-    /*Copy buffer again, till seeking good way of syncronization with slirp mbuf management code*/
     AssertRelease(pItem->mbuf == NULL);
-#endif
     return RT_SUCCESS(rc);
 }