Changeset 6223 in vbox

Timestamp:

Dec 30, 2007 10:08:26 PM (17 years ago)

Author:

vboxsync

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

27048

Message:

We can use poll instead of select and cleanups

Location:

trunk/src/VBox/Devices/Parallel

Files:

• DevParallel.cpp (modified) (2 diffs)
• DrvHostParallel.cpp (modified) (3 diffs)

trunk/src/VBox/Devices/Parallel/DevParallel.cpp

@@ -146 +146 @@
 __END_DECLS
 
+#ifdef IN_RING3
 static void parallel_set_irq(ParallelState *s)
 {
@@ -160 +161 @@
     PDMDevHlpISASetIrqNoWait(CTXSUFF(s->pDevIns), s->irq, 0);
 }
+#endif
 
 static int parallel_ioport_write(void *opaque, uint32_t addr, uint32_t val)

trunk/src/VBox/Devices/Parallel/DrvHostParallel.cpp

@@ -34 +34 @@
 # include <sys/types.h>
 # include <sys/stat.h>
+# include <sys/poll.h>
 # include <fcntl.h>
 # include <unistd.h>
@@ -196 +197 @@
 {
     PDRVHOSTPARALLEL pData = PDMINS2DATA(pDrvIns, PDRVHOSTPARALLEL);
-    fd_set readfds;
-
-    /*
-     * We can wait for interrupts using the select call on linux hosts.
-     */
-
-    /*
-     * Setup the file descriptor set.
-     */
-    FD_ZERO(&readfds);
-    FD_SET(pData->FileDevice, &readfds);
-    FD_SET(pData->WakeupPipeR, &readfds);
-
+    struct pollfd aFDs[2];
+
+    /*
+     * We can wait for interrupts using poll on linux hosts.
+     */
     while (pThread->enmState == PDMTHREADSTATE_RUNNING)
     {
         int rc;
 
-        rc = select(FD_SETSIZE, &readfds, NULL, NULL, NULL);
+        aFDs[0].fd      = pData->FileDevice;
+        aFDs[0].events  = POLLIN;
+        aFDs[0].revents = 0;
+        aFDs[1].fd      = pData->WakeupPipeR;
+        aFDs[1].events  = POLLIN | POLLERR | POLLHUP;
+        aFDs[1].revents = 0;
+        rc = poll(aFDs, ELEMENTS(aFDs), -1);
         if (rc < 0)
         {
-            AssertMsgFailed(("select failed with rc=%d\n", RTErrConvertFromErrno(errno)));
+            AssertMsgFailed(("poll failed with rc=%d\n", RTErrConvertFromErrno(errno)));
             return RTErrConvertFromErrno(errno);
         }
 
-        if (FD_ISSET(pData->WakeupPipeR, &readfds))
+        if (pThread->enmState != PDMTHREADSTATE_RUNNING)
+            break;
+        if (rc > 0 && aFDs[1].revents)
         {
+            if (aFDs[1].revents & (POLLHUP | POLLERR | POLLNVAL))
+                break;
             /* notification to terminate -- drain the pipe */
             char ch;
@@ -338 +341 @@
      */
     rc = PDMDrvHlpPDMThreadCreate(pDrvIns, &pData->pMonitorThread, pData, drvHostParallelMonitorThread, drvHostParallelWakeupMonitorThread, 0, 
-                                  RTTHREADTYPE_IO, "Interrupt Monitor");
+                                  RTTHREADTYPE_IO, "HostParallel");
     if (VBOX_FAILURE(rc))
-        return PDMDrvHlpVMSetError(pDrvIns, rc, RT_SRC_POS, N_("HostSerial#%d cannot create monitor thread"), pDrvIns->iInstance);
+        return PDMDrvHlpVMSetError(pDrvIns, rc, RT_SRC_POS, N_("HostParallel#%d cannot create monitor thread"), pDrvIns->iInstance);
 
     return VINF_SUCCESS;