Changeset 13663 in vbox

Timestamp:

Oct 29, 2008 4:02:21 PM (16 years ago)

Author:

vboxsync

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

38606

Message:

serial: use the new RTThreadPoke() runtime function to interrupt the ioctl syscall

File:

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

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

@@ -34 +34 @@
 #include <iprt/asm.h>
 #include <iprt/assert.h>
-#include <iprt/stream.h>
 #include <iprt/semaphore.h>
 #include <iprt/file.h>
@@ -53 +52 @@
 # include <sys/ioctl.h>
 # include <pthread.h>
-# include <sys/signal.h>
 
 # ifdef RT_OS_LINUX
@@ -1011 +1009 @@
 }
 
-# ifdef RT_OS_LINUX
-/** Signal handler for SIGUSR2.
- * Used to interrupt ioctl(TIOCMIWAIT). */
-static void drvHostSerialSignalHandler(int iSignal)
-{
-    /* Do nothing. */
-    return;
-}
-# endif /* RT_OS_LINUX */
-
 /**
  * Unblock the monitor thread so it can respond to a state change.
@@ -1056 +1044 @@
      * 3. The second approach doesn't work too, the ioctl doesn't return.
      *    But it seems that the ioctl is interruptible (return code in errno is EINTR).
-     *    We get the native thread id of the PDM thread and send a signal with pthread_kill().
      */
 
@@ -1115 +1102 @@
 #  endif
 
-    pthread_t        ThreadId = (pthread_t)RTThreadGetNative(pThread->Thread);
-    struct sigaction SigactionThread;
-    struct sigaction SigactionThreadOld;
-
-    memset(&SigactionThread, 0, sizeof(struct sigaction));
-    sigemptyset(&SigactionThread.sa_mask);
-    SigactionThread.sa_flags = 0;
-    SigactionThread.sa_handler = drvHostSerialSignalHandler;
-    rc = sigaction(SIGUSR2, &SigactionThread, &SigactionThreadOld);
-    if (rc < 0)
+    rc = RTThreadPoke(pThread->Thread);
+    if (RT_FAILURE(rc))
         PDMDrvHlpVMSetRuntimeError(pDrvIns, false, "DrvHostSerialFail",
-                                    N_("Suspending serial monitor thread failed for serial device '%s' (%Vrc). The shutdown may take extremly long"),
-                                    pThis->pszDevicePath, RTErrConvertFromErrno(errno));
-
-    rc = pthread_kill(ThreadId, SIGUSR2);
-    if (rc < 0)
-        PDMDrvHlpVMSetRuntimeError(pDrvIns, false, "DrvHostSerialFail",
-                                    N_("Suspending serial monitor thread failed for serial device '%s' (%Vrc). The shutdown may take extremly long"),
+                                    N_("Suspending serial monitor thread failed for serial device '%s' (%Vrc). The shutdown may take longer than expected"),
                                     pThis->pszDevicePath, RTErrConvertFromErrno(rc));
 
-    /* Restore old action handler. */
-    sigaction(SIGUSR2, &SigactionThreadOld, NULL);
-
 # else  /* !RT_OS_LINUX*/
+
     /* In polling mode there is nobody to wake up (PDMThread will cancel the sleep). */
     NOREF(pDrvIns);