Changeset 12347 in vbox for trunk/src

Timestamp:

Sep 10, 2008 12:15:20 PM (16 years ago)

Author:

vboxsync

Message:

DrvHostSerial: poll is busted on darwin/x86, so use select for the receive waiting. Thread function SHALL return an failure status if they return out of order - fixed the receive thread function. TODO: check the rest. TODO: Check hHaltEventSem reset

File:

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

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

@@ -46 +46 @@
 # include <string.h>
 # include <unistd.h>
-# include <sys/poll.h>
+# ifdef RT_OS_DARWIN
+#  include <sys/select.h>
+# else
+#  include <sys/poll.h>
+# endif
 # include <sys/ioctl.h>
 # include <pthread.h>
@@ -536 +540 @@
     size_t cbRemaining = 0; /* start by reading host data */
     int rc = VINF_SUCCESS;
+    int rcThread = VINF_SUCCESS;
 
     if (pThread->enmState == PDMTHREADSTATE_INITIALIZING)
@@ -541 +546 @@
 
 #ifdef RT_OS_WINDOWS
-    HANDLE haWait[2];
-    haWait[0] = pThis->hEventRecv;
-    haWait[1] = pThis->hHaltEventSem;
+    HANDLE ahWait[2];
+    ahWait[0] = pThis->hEventRecv;
+    ahWait[1] = pThis->hHaltEventSem;
 #endif
 
@@ -552 +557 @@
             /* Get a block of data from the host serial device. */
 
-#if defined(RT_OS_LINUX) || defined(RT_OS_DARWIN)
+#if defined(RT_OS_DARWIN) /* poll is broken on x86 darwin, returns POLLNVAL. */
+            fdset RdSet;
+            FDSET_ZERO(&RdSet);
+            FDSET_SET(pThis->DeviceFile, &RdSet);
+            FDSET_SET(pThis->WakeupPipeR, &RdSet);
+            fdset XcptSet;
+            FDSET_ZERO(&XcptSet);
+            FDSET_SET(pThis->DeviceFile, &XcptSet);
+            FDSET_SET(pThis->WakeupPipeR, &XcptSet);
+            rc = select(RT_MAX(pThis->WakeupPipeR, pThis->DeviceFile) + 1, &RdSet, NULL, &XcptSet, NULL);
+            if (rc == -1)
+            {
+                int err = errno;
+                rcThread = RTErrConvertFromErrno(err);
+                LogRel(("HostSerial#%d: select failed with errno=%d / %Rrc, terminating the worker thread.\n", pDrvIns->iInstance, err, rcThread));
+                break;
+            }
+
+            /* this might have changed in the meantime */
+            if (pThread->enmState != PDMTHREADSTATE_RUNNING)
+                break;
+            if (rc == 0)
+                continue;
+
+            /* drain the wakeup pipe */
+            if (   FDSET_ISSET(pThis->WakeupPipeR, &RdSet)
+                || FDSET_ISSET(pThis->WakeupPipeR, &XcptSet))
+            {
+                rc = RTFileRead(pThis->WakeupPipeR, abBuffer, 1, &cbRead);
+                if (RT_FAILURE(rc))
+                {
+                    LogRel(("HostSerial#%d: draining the wakekup pipe failed with %Rrc, terminating the worker thread.\n", pDrvIns->iInstance, rc));
+                    rcThread = rc;
+                    break;
+                }
+                continue;
+            }
+
+            /* read data from the serial port. */
+            rc = RTFileRead(pThis->DeviceFile, abBuffer, sizeof(abBuffer), &cbRead);
+            if (RT_FAILURE(rc))
+            {
+                LogRel(("HostSerial#%d: Read failed with %Rrc, terminating the worker thread.\n", pDrvIns->iInstance, rc));
+                rcThread = rc;
+                break;
+            }
+            cbRemaining = cbRead;
+
+#elif defined(RT_OS_LINUX)
 
             size_t cbRead;
@@ -565 +618 @@
             if (rc < 0)
             {
-                /* poll failed for whatever reason */
+                int err = errno;
+                rcThread = RTErrConvertFromErrno(err);
+                LogRel(("HostSerial#%d: poll failed with errno=%d / %Rrc, terminating the worker thread.\n", pDrvIns->iInstance, err, rcThread));
                 break;
             }
@@ -576 +631 @@
                     break;
                 /* notification to terminate -- drain the pipe */
-                char ch;
-                size_t cbRead;
-                RTFileRead(pThis->WakeupPipeR, &ch, 1, &cbRead);
+                RTFileRead(pThis->WakeupPipeR, &abBuffer, 1, &cbRead);
                 continue;
             }
@@ -585 +638 @@
             {
                 LogRel(("HostSerial#%d: Read failed with %Rrc, terminating the worker thread.\n", pDrvIns->iInstance, rc));
+                rcThread = rc;
                 break;
             }
@@ -602 +656 @@
                 if (dwRet == ERROR_IO_PENDING)
                 {
-                    dwRet = WaitForMultipleObjects(2, haWait, FALSE, INFINITE);
+                    dwRet = WaitForMultipleObjects(2, ahWait, FALSE, INFINITE);
                     if (dwRet != WAIT_OBJECT_0)
                     {
@@ -611 +665 @@
                 else
                 {
-                    LogRel(("HostSerial#%d: Wait failed with error %Rrc; terminating the worker thread.\n", pDrvIns->iInstance, RTErrConvertFromWin32(dwRet)));
+                    rcThread = RTErrConvertFromWin32(dwRet);
+                    LogRel(("HostSerial#%d: Wait failed with error %Rrc; terminating the worker thread.\n", pDrvIns->iInstance, rcThread));
                     break;
                 }
@@ -624 +679 @@
                 if (!ReadFile(pThis->hDeviceFile, abBuffer, sizeof(abBuffer), &dwNumberOfBytesTransferred, &pThis->overlappedRecv))
                 {
-                    LogRel(("HostSerial#%d: Read failed with error %Rrc; terminating the worker thread.\n", pDrvIns->iInstance, RTErrConvertFromWin32(GetLastError())));
+                    rcThread = RTErrConvertFromWin32(GetLastError());
+                    LogRel(("HostSerial#%d: Read failed with error %Rrc; terminating the worker thread.\n", pDrvIns->iInstance, rcThread));
                     break;
                 }
@@ -685 +741 @@
             {
                 LogRel(("HostSerial#%d: NotifyRead failed with %Rrc, terminating the worker thread.\n", pDrvIns->iInstance, rc));
+                rcThread = rc;
                 break;
             }
@@ -690 +747 @@
     }
 
-    return VINF_SUCCESS;
+    return rcThread;
 }