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

Timestamp:

Feb 13, 2008 12:53:15 PM (17 years ago)

Author:

vboxsync

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

28086

Message:

Converted the TAP async thread to a PDMDrvThread

File:

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

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

@@ -125 +125 @@
     /** The read end of the control pipe. */
     RTFILE                  PipeRead;
-    /** The thread state. */
-    ASYNCSTATE volatile     enmState;
     /** Reader thread. */
-    RTTHREAD                Thread;
+    PPDMTHREAD              pThread;
     /** We are waiting for more receive buffers. */
     uint32_t volatile       fOutOfSpace;
@@ -282 +280 @@
  * @param   pvUser          Pointer to a DRVTAP structure.
  */
-static DECLCALLBACK(int) drvTAPAsyncIoThread(RTTHREAD ThreadSelf, void *pvUser)
-{
-    PDRVTAP pData = (PDRVTAP)pvUser;
+static DECLCALLBACK(int) drvTAPAsyncIoThread(PPDMDRVINS pDrvIns, PPDMTHREAD pThread)
+{
+    PDRVTAP pData = PDMINS2DATA(pDrvIns, PDRVTAP);
     LogFlow(("drvTAPAsyncIoThread: pData=%p\n", pData));
+
+    if (pThread->enmState == PDMTHREADSTATE_INITIALIZING)
+        return VINF_SUCCESS;
+
     STAM_PROFILE_ADV_START(&pData->StatReceive, a);
 
@@ -294 +296 @@
      * Polling loop.
      */
-    for (;;)
+    while (pThread->enmState == PDMTHREADSTATE_RUNNING)
     {
         /*
@@ -309 +311 @@
         errno=0;
         rc = poll(&aFDs[0], ELEMENTS(aFDs), -1 /* infinite */);
+
+        /* this might have changed in the meantime */
+        if (pThread->enmState != PDMTHREADSTATE_RUNNING)
+            break;
+
         STAM_PROFILE_ADV_START(&pData->StatReceive, a);
         if (    rc > 0
@@ -350 +357 @@
                     STAM_PROFILE_START(&pData->StatRecvOverflows, b);
                     while (   cbMax == 0
-                           && pData->enmState != ASYNCSTATE_TERMINATE)
+                           && pThread->enmState == PDMTHREADSTATE_RUNNING)
                     {
                         LogFlow(("drvTAPAsyncIoThread: cbMax=%d cbRead=%d waiting...\n", cbMax, cbRead));
@@ -365 +372 @@
                     STAM_PROFILE_STOP(&pData->StatRecvOverflows, b);
                     STAM_PROFILE_ADV_START(&pData->StatReceive, a);
-                    if (pData->enmState == ASYNCSTATE_TERMINATE)
+                    if (pThread->enmState == PDMTHREADSTATE_RUNNING)
                         break;
                 }
@@ -397 +404 @@
                  && aFDs[1].revents)
         {
-            LogFlow(("drvTAPAsyncIoThread: Control message: enmState=%d revents=%#x\n", pData->enmState, aFDs[1].revents));
-            if (pData->enmState == ASYNCSTATE_TERMINATE)
-                break;
+            LogFlow(("drvTAPAsyncIoThread: Control message: enmState=%d revents=%#x\n", pThread->enmState, aFDs[1].revents));
             if (aFDs[1].revents & (POLLHUP | POLLERR | POLLNVAL))
                 break;
@@ -432 +437 @@
 }
 
-#else
+
+/**
+ * Unblock the send thread so it can respond to a state change.
+ *
+ * @returns VBox status code.
+ * @param   pDevIns     The pcnet device instance.
+ * @param   pThread     The send thread.
+ */
+static DECLCALLBACK(int) drvTapAsyncIoWakeup(PPDMDRVINS pDrvIns, PPDMTHREAD pThread)
+{
+    PDRVTAP pData = PDMINS2DATA(pDrvIns, PDRVTAP);
+
+    /* Ensure that it does not spin in the CanReceive loop */
+    if (ASMAtomicXchgU32(&pData->fOutOfSpace, false))
+        RTSemEventSignal(pData->EventOutOfSpace);
+
+    int rc = RTFileWrite(pData->PipeWrite, "", 1, NULL);
+    AssertRC(rc);
+
+    return VINF_SUCCESS;
+}
+
+#else /* !ASYNC_NET */
+
 /**
  * Poller callback.
@@ -492 +520 @@
     STAM_PROFILE_ADV_STOP(&pData->StatReceive, a);
 }
-#endif
+#endif /* ASYNC_NET */
 
 
@@ -922 +950 @@
 #ifdef ASYNC_NET
     /*
-     * Terminate the Async I/O Thread.
-     */
-    ASMAtomicXchgSize(&pData->enmState, ASYNCSTATE_TERMINATE);
-    if (pData->Thread != NIL_RTTHREAD)
-    {
-        /* Ensure that it does not spin in the CanReceive loop */
-        if (ASMAtomicXchgU32(&pData->fOutOfSpace, false))
-            RTSemEventSignal(pData->EventOutOfSpace);
-
-        int rc = RTFileWrite(pData->PipeWrite, "", 1, NULL);
-        AssertRC(rc);
-        rc = RTThreadWait(pData->Thread, 5000, NULL);
-        AssertRC(rc);
-        pData->Thread = NIL_RTTHREAD;
-    }
-
-    /*
      * Terminate the control pipe.
      */
@@ -1025 +1036 @@
     pData->pszSetupApplication          = NULL;
     pData->pszTerminateApplication      = NULL;
-#ifdef ASYNC_NET
-    pData->Thread                       = NIL_RTTHREAD;
-    pData->enmState                     = ASYNCSTATE_RUNNING;
-#endif
+
     /* IBase */
     pDrvIns->IBase.pfnQueryInterface    = drvTAPQueryInterface;
@@ -1160 +1168 @@
      * Create the async I/O thread.
      */
-    rc = RTThreadCreate(&pData->Thread, drvTAPAsyncIoThread, pData, 128*_1K, RTTHREADTYPE_IO, RTTHREADFLAGS_WAITABLE, "TAP");
+    rc = PDMDrvHlpPDMThreadCreate(pDrvIns, &pData->pThread, pData, drvTAPAsyncIoThread, drvTapAsyncIoWakeup, 128 * _1K, RTTHREADTYPE_IO, "TAP");
     AssertRCReturn(rc, rc);
 #else