Changeset 69897 in vbox for trunk/src/VBox/Runtime

Timestamp:

Dec 1, 2017 11:17:15 AM (7 years ago)

Author:

vboxsync

Message:

Runtime/serialport-posix: Updates

File:

• trunk/src/VBox/Runtime/r3/posix/serialport-posix.cpp (modified) (9 diffs)

trunk/src/VBox/Runtime/r3/posix/serialport-posix.cpp

@@ -97 +97 @@
     /** Flag whether the monitoring thread should shutdown. */
     volatile bool       fMonThrdShutdown;
+    /** Reading end of wakeup pipe. */
+    int                 iFdPipeR;
+    /** Writing end of wakeup pipe. */
+    int                 iFdPipeW;
     /** The current active config (we assume no one changes this behind our back). */
     struct termios      PortCfg;
@@ -119 +123 @@
 typedef const RTSERIALPORTBRATECONVDESC *PCRTSERIALPORTBRATECONVDESC;
 
+
 /*********************************************************************************************************************************
 *   Defined Constants And Macros                                                                                                 *
 *********************************************************************************************************************************/
 
+/** The event poller was woken up due to an external interrupt. */
+#define RTSERIALPORT_WAKEUP_PIPE_REASON_INTERRUPT               0x0
+/** The event poller was woken up due to a change in the monitored status lines. */
+#define RTSERIALPORT_WAKEUP_PIPE_REASON_STS_LINE_CHANGED        0x1
+/** The monitor thread encoutnered repeating errors querying the status lines and terminated. */
+#define RTSERIALPORT_WAKEUP_PIPE_REASON_STS_LINE_MONITOR_FAILED 0x2
 
 
@@ -424 +435 @@
 
 /**
+ * Wakes up any thread polling for a serial port event with the given reason.
+ *
+ * @returns IPRT status code.
+ * @param   pThis                   The internal serial port instance data.
+ * @param   bWakeupReason           The wakeup reason to pass to the event poller.
+ */
+DECLINLINE(int) rtSerialPortWakeupEvtPoller(PRTSERIALPORTINTERNAL pThis, uint8_t bWakeupReason)
+{
+    int rcPsx = write(pThis->iFdPipeW, &bWakeupReason, 1);
+    if (rcPsx != 1)
+        return RTErrConvertFromErrno(errno);
+
+    return VINF_SUCCESS;
+}
+
+
+/**
  * The status line monitor thread worker.
  *
@@ -471 +499 @@
             rcPsx = ioctl(pThis->iFd, TIOCMIWAIT, fStsLinesChk);
             if (!rcPsx)
-            { /** @todo Notify any event waiter. */ }
+            {
+                rc = rtSerialPortWakeupEvtPoller(pThis, RTSERIALPORT_WAKEUP_PIPE_REASON_STS_LINE_CHANGED);
+                if (RT_FAILURE(rc))
+                    break;
+            }
             else if (rcPsx == -1 && errno != EINTR)
                 fPoll = true;
@@ -486 +518 @@
                 if (((fStsLines ^ fStsLinesOld) & fStsLinesChk))
                 {
-                    /** @todo Notify any event waiter. */
+                    rc = rtSerialPortWakeupEvtPoller(pThis, RTSERIALPORT_WAKEUP_PIPE_REASON_STS_LINE_CHANGED);
+                    if (RT_FAILURE(rc))
+                        break;
+
                     fStsLinesOld = fStsLines;
                 }
@@ -499 +534 @@
                  */
                 if (cStsLineGetErrors++ >= 10)
-                { /** @todo Send error notification */ }
+                {
+                    rc = RTErrConvertFromErrno(errno);
+                    rtSerialPortWakeupEvtPoller(pThis, RTSERIALPORT_WAKEUP_PIPE_REASON_STS_LINE_MONITOR_FAILED);
+                    break;
+                }
 
                 RTThreadSleep(100 /*ms*/);
@@ -591 +630 @@
         if (pThis->iFd != -1)
         {
-            rc = rtSerialPortSetDefaultCfg(pThis);
-            if (   RT_SUCCESS(rc)
-                && (fFlags & RT_SERIALPORT_OPEN_F_SUPPORT_STATUS_LINE_MONITORING))
-                rc = rtSerialPortMonitorThreadCreate(pThis);
-
-            if (RT_SUCCESS(rc))
+            /* Create wakeup pipe for the event API. */
+            int aPipeFds[2];
+            int rcPsx = pipe(&aPipeFds[0]);
+            if (!rcPsx)
             {
-                *phSerialPort = pThis;
-                return VINF_SUCCESS;
+                /* Make the pipes close on exec. */
+                pThis->iFdPipeR = aPipeFds[0];
+                pThis->iFdPipeW = aPipeFds[1];
+
+                if (fcntl(pThis->iFdPipeR, F_SETFD, FD_CLOEXEC))
+                    rc = RTErrConvertFromErrno(errno);
+
+                if (   RT_SUCCESS(rc)
+                    && fcntl(pThis->iFdPipeW, F_SETFD, FD_CLOEXEC))
+                    rc = RTErrConvertFromErrno(errno);
+
+                if (RT_SUCCESS(rc))
+                {
+                    rc = rtSerialPortSetDefaultCfg(pThis);
+                    if (   RT_SUCCESS(rc)
+                        && (fFlags & RT_SERIALPORT_OPEN_F_SUPPORT_STATUS_LINE_MONITORING))
+                        rc = rtSerialPortMonitorThreadCreate(pThis);
+
+                    if (RT_SUCCESS(rc))
+                    {
+                        *phSerialPort = pThis;
+                        return VINF_SUCCESS;
+                    }
+                }
+
+                close(pThis->iFdPipeR);
+                close(pThis->iFdPipeW);
             }
+            else
+                rc = RTErrConvertFromErrno(errno);
 
             close(pThis->iFd);
@@ -633 +697 @@
 
     close(pThis->iFd);
+    close(pThis->iFdPipeR);
+    close(pThis->iFdPipeW);
     RTMemFree(pThis);
     return VINF_SUCCESS;
@@ -770 +836 @@
 RTDECL(int) RTSerialPortEvtPollInterrupt(RTSERIALPORT hSerialPort)
 {
-    RT_NOREF(hSerialPort);
-    return VERR_NOT_IMPLEMENTED;
+    PRTSERIALPORTINTERNAL pThis = hSerialPort;
+    AssertPtrReturn(pThis, VERR_INVALID_PARAMETER);
+    AssertReturn(pThis->u32Magic == RTSERIALPORT_MAGIC, VERR_INVALID_HANDLE);
+
+    return rtSerialPortWakeupEvtPoller(pThis, RTSERIALPORT_WAKEUP_PIPE_REASON_INTERRUPT);
 }