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

Timestamp:

Aug 20, 2009 9:24:47 AM (15 years ago)

Author:

vboxsync

Message:

NAT: more comments (send/recv are terms from the guest's point of view)

File:

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

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

@@ -151 +151 @@
     /** Queue for NAT-thread-external events. */
     PRTREQQUEUE             pSlirpReqQueue;
-    /* Send queue */
 #ifndef SLIRP_SPLIT_CAN_OUTPUT
-    PPDMQUEUE               pSendQueue;
+    /* Receive PDM queue (deliver packets to the guest) */
+    PPDMQUEUE               pRecvQueue;
 #endif
 
@@ -170 +170 @@
     STAMCOUNTER             StatQueuePktSent;       /**< counting packet sent via PDM queue */
     STAMCOUNTER             StatQueuePktDropped;    /**< counting packet drops by PDM queue */
-    STAMCOUNTER             StatConsumerFalse;
+    STAMCOUNTER             StatConsumerFalse;      /**< how often to wait for guest RX buffers */
 #ifdef SLIRP_SPLIT_CAN_OUTPUT
+    /** thread delivering packets for receiving by the guest */
     PPDMTHREAD              pRecvThread;
+    /** event to wakeup the guest receive thread */
     RTSEMEVENT              EventRecv;
-    STAMCOUNTER             StatNATRecvWakeups;
+    /** Receive Req queue (deliver packets to the guest) */
     PRTREQQUEUE             pRecvReqQueue;
+    STAMCOUNTER             StatNATRecvWakeups;     /**< how often to wakeup the guest RX thread */
 #endif
 } DRVNAT;
@@ -226 +229 @@
     PDRVNAT pThis = PDMINS_2_DATA(pDrvIns, PDRVNAT);
     int rc = RTSemEventSignal(pThis->EventRecv);
+
     STAM_COUNTER_INC(&pThis->StatNATRecvWakeups);
     AssertReleaseRC(rc);
@@ -233 +237 @@
 static DECLCALLBACK(void) drvNATRecvWorker(PDRVNAT pThis, uint8_t *pu8Buf, int cb)
 {
-    int rc;
     if (RT_FAILURE(pThis->pPort->pfnWaitReceiveAvail(pThis->pPort, RT_INDEFINITE_WAIT)))
     {
         AssertMsgFailed(("No RX available even on indefinite wait"));
     }
-    rc = pThis->pPort->pfnReceive(pThis->pPort, pu8Buf, cb);
+    int rc = pThis->pPort->pfnReceive(pThis->pPort, pu8Buf, cb);
     RTMemFree(pu8Buf);
     AssertRC(rc);
@@ -257 +260 @@
 
 /**
- * Send data to the network.
+ * Called by the guest to send data to the network.
  *
  * @returns VBox status code.
@@ -608 +611 @@
 
 #ifndef SLIRP_SPLIT_CAN_OUTPUT
-    PDRVNATQUEUITEM pItem = (PDRVNATQUEUITEM)PDMQueueAlloc(pThis->pSendQueue);
+    PDRVNATQUEUITEM pItem = (PDRVNATQUEUITEM)PDMQueueAlloc(pThis->pRecvQueue);
     if (pItem)
     {
@@ -615 +618 @@
         pItem->mbuf = pvArg;
         Log2(("pItem:%p %.Rhxd\n", pItem, pItem->pu8Buf));
-        PDMQueueInsert(pThis->pSendQueue, &pItem->Core);
+        PDMQueueInsert(pThis->pRecvQueue, &pItem->Core);
         STAM_COUNTER_INC(&pThis->StatQueuePktSent);
         return;
@@ -1004 +1007 @@
 #ifndef SLIRP_SPLIT_CAN_OUTPUT
             rc = PDMDrvHlpPDMQueueCreate(pDrvIns, sizeof(DRVNATQUEUITEM), QUEUE_SIZE, 0,
-                                         drvNATQueueConsumer, "NAT", &pThis->pSendQueue);
+                                         drvNATQueueConsumer, "NAT", &pThis->pRecvQueue);
             if (RT_FAILURE(rc))
             {