Changeset 4993 in vbox for trunk/src

Timestamp:

Sep 24, 2007 9:02:26 AM (17 years ago)

Author:

vboxsync

Message:

HostSerial: Use pipe for the receive thread to wake it up on shutdown on linux hosts

File:

• trunk/src/VBox/Devices/Serial/DrvHostSerial.cpp (modified) (7 diffs)

trunk/src/VBox/Devices/Serial/DrvHostSerial.cpp

@@ -81 +81 @@
     RTSEMEVENT                  SendSem;
 
+#ifdef RT_OS_LINUX
+    /** The receive thread wakeup pipe. */
+    RTFILE                      WakeupPipeR;
+    RTFILE                      WakeupPipeW;
+#endif
+
     /** the device path */
     char                        *pszDevicePath;
@@ -100 +106 @@
 #define PDMICHAR_2_DRVHOSTSERIAL(pInterface) ( (PDRVHOSTSERIAL)((uintptr_t)pInterface - RT_OFFSETOF(DRVHOSTSERIAL, IChar)) )
 
-
+#ifdef RT_OS_LINUX
+/** String written to the wakeup pipe. */
+#define WAKE_UP_STRING      "WakeUp!"
+/** Length of the string written. */
+#define WAKE_UP_STRING_LEN  ( sizeof (WAKE_UP_STRING) - 1 )
+#endif
 /* -=-=-=-=- IBase -=-=-=-=- */
 
@@ -445 +456 @@
 
 #ifdef RT_OS_LINUX
-            struct pollfd pfd;
-
-            pfd.fd = pData->DeviceFile;
-            pfd.events = POLLIN;
-
-            rc = poll(&pfd, 1, -1);
+            struct pollfd pfd[2];
+
+            pfd[0].fd = pData->DeviceFile;
+            pfd[0].events = POLLIN;
+            pfd[1].fd = pData->WakeupPipeR;
+            pfd[1].events = POLLIN | POLLERR | POLLHUP;
+
+            rc = poll(&pfd[0], 2, -1);
+
             if (rc < 0)
                 break;
+
+            if (rc > 0)
+            {
+                if (pfd[1].revents & POLLIN)
+                {
+                    /* Empty the pipe. */
+                    char szBuf[WAKE_UP_STRING_LEN];
+                    rc = RTFileRead (pData->WakeupPipeR, szBuf, sizeof (szBuf), NULL);
+                    AssertRC (rc);
+                    break;
+                }
+            }
 #elif defined(RT_OS_WINDOWS)
             BOOL retval;
@@ -523 +549 @@
 {
     PDRVHOSTSERIAL pData = PDMINS2DATA(pDrvIns, PDRVHOSTSERIAL);
+#ifdef RT_OS_LINUX
+    int filedes[2];
+#endif
+
     LogFlow(("%s: iInstance=%d\n", __FUNCTION__, pDrvIns->iInstance));
 
@@ -579 +609 @@
 #ifdef RT_OS_LINUX
     fcntl(pData->DeviceFile, F_SETFL, O_NONBLOCK);
+    /* Create the wakeup pipe. */
+    if (!pipe(filedes))
+    {
+        pData->WakeupPipeR = filedes[0];
+        pData->WakeupPipeW = filedes[1];
+    }
 #elif defined(RT_OS_WINDOWS)
     /* Set the COMMTIMEOUTS to get non blocking I/O */
@@ -629 +665 @@
 {
     PDRVHOSTSERIAL     pData = PDMINS2DATA(pDrvIns, PDRVHOSTSERIAL);
+    int rc;
 
     LogFlow(("%s: iInstance=%d\n", __FUNCTION__, pDrvIns->iInstance));
 
     ASMAtomicXchgBool(&pData->fShutdown, true);
+
+#ifdef RT_OS_LINUX
+    /* Notify the receive thread that we want to shutdown. */
+    rc = RTFileWrite (pData->WakeupPipeW, WAKE_UP_STRING, WAKE_UP_STRING_LEN, NULL);
+    if (VBOX_SUCCESS (rc))
+        RTFileFlush (pData->WakeupPipeW);
+#endif
     if (pData->ReceiveThread != NIL_RTTHREAD)
     {
-        int rc = RTThreadWait(pData->ReceiveThread, 15000, NULL);
+        rc = RTThreadWait(pData->ReceiveThread, 15000, NULL);
         if (RT_FAILURE(rc))
             LogRel(("HostSerial%d: receive thread did not terminate (rc=%Rrc)\n", pDrvIns->iInstance, rc));
@@ -655 +699 @@
         pData->SendThread = NIL_RTTHREAD;
     }
+
+#ifdef RT_OS_LINUX
+    RTFileClose(pData->WakeupPipeR);
+    RTFileClose(pData->WakeupPipeW);
+#endif
+
+    RTFileClose(pData->DeviceFile);
 }