Changeset 7785 in vbox

Timestamp:

Apr 8, 2008 7:58:25 AM (17 years ago)

Author:

vboxsync

Message:

comment, cosmetics

File:

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

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

@@ -245 +245 @@
 static DECLCALLBACK(void) drvTAPNotifyCanReceive(PPDMINETWORKCONNECTOR pInterface)
 {
+#ifdef ASYNC_NET
     PDRVTAP pData = PDMINETWORKCONNECTOR_2_DRVTAP(pInterface);
 
@@ -262 +263 @@
     if (ASMAtomicXchgU32(&pData->fOutOfSpace, false))
         RTSemEventSignal(pData->EventOutOfSpace);
+#endif
 }
 
@@ -324 +326 @@
             rc = RT_LIKELY(rc == DLPI_SUCCESS) ? VINF_SUCCESS : SolarisDLPIErr2VBoxErr(rc);
 #else
+            /** @note At least on Linux we will never receive more than one network packet
+             *        after poll() returned successfully. I don't know why but a second
+             *        RTFileRead() operation will return with VERR_TRY_AGAIN. */
             rc = RTFileRead(pData->FileDevice, achBuf, sizeof(achBuf), &cbRead);
 #endif
@@ -353 +358 @@
                     {
                         LogFlow(("drvTAPAsyncIoThread: cbMax=%d cbRead=%d waiting...\n", cbMax, cbRead));
-#if 1
                         /* We get signalled by the network driver. 50ms is just for sanity */
                         ASMAtomicXchgU32(&pData->fOutOfSpace, true);
                         RTSemEventWait(pData->EventOutOfSpace, 50);
-#else
-                        RTThreadSleep(1);
-#endif
                         cbMax = pData->pPort->pfnCanReceive(pData->pPort);
                     }
@@ -378 +379 @@
                 pData->u64LastReceiveTS = u64Now;
 #endif
-                Log2(("drvTAPAsyncIoThread: cbRead=%#x\n"
-                      "%.*Vhxd\n",
-                      cbRead, cbRead, achBuf));
+                Log2(("drvTAPAsyncIoThread: cbRead=%#x\n" "%.*Vhxd\n", cbRead, cbRead, achBuf));
                 STAM_COUNTER_INC(&pData->StatPktRecv);
                 STAM_COUNTER_ADD(&pData->StatPktRecvBytes, cbRead);