Changeset 13660 in vbox

Timestamp:

Oct 29, 2008 3:46:17 PM (16 years ago)

Author:

vboxsync

Message:

IPRT: RTThreadPoke update - don't use signal but sigaction (more well defined interface), make sure SIGUSR2 isn't masked on the threads and that it's interruptable (i.e. can interrupt sys calls).

File:

• trunk/src/VBox/Runtime/r3/posix/thread-posix.cpp (modified) (6 diffs)

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

@@ -46 +46 @@
 #include <iprt/asm.h>
 #include <iprt/err.h>
+#include <iprt/string.h>
 #include "internal/thread.h"
+
+
+/*******************************************************************************
+*   Defined Constants And Macros                                               *
+*******************************************************************************/
+/** The signal we're using for RTThreadPoke. */
+#define RTTHREAD_POSIX_POKE_SIG  SIGUSR2
 
 
@@ -75 +83 @@
     /*
      * Register the dummy signal handler for RTThreadPoke.
-     */
-    void (*pfnOld)(int);
-    pfnOld = signal(SIGUSR2, rtThreadPosixPokeSignal);
-    Assert(pfnOld == SIG_DFL);
+     * (Assert may explode here, but at least we'll notice.)
+     */
+    struct sigaction SigAct;
+    memset(&SigAct, '\0', sizeof(SigAct));
+    SigAct.sa_handler = rtThreadPosixPokeSignal;
+    sigfillset(&SigAct.sa_mask);
+    SigAct.sa_flags = 0;
+
+    struct sigaction SigActOld;
+    if (!sigaction(RTTHREAD_POSIX_POKE_SIG, &SigAct, &SigActOld))
+        Assert(SigActOld.sa_handler == SIG_DFL);
+    else
+    {
+        rc = RTErrConvertFromErrno(errno);
+        AssertMsgFailed(("rc=%Rrc errno=%d\n", rc, errno));
+        pthread_key_delete(g_SelfKey);
+        g_SelfKey = 0;
+    }
     return rc;
 }
@@ -109 +131 @@
 static void rtThreadPosixPokeSignal(int iSignal)
 {
-    Assert(iSignal == SIGUSR2);
+    Assert(iSignal == RTTHREAD_POSIX_POKE_SIG);
     NOREF(iSignal);
 }
@@ -130 +152 @@
     sigemptyset(&SigSet);
     sigaddset(&SigSet, SIGALRM);
+    sigdelset(&SigSet, RTTHREAD_POSIX_POKE_SIG);
     sigprocmask(SIG_BLOCK, &SigSet, NULL);
+    siginterrupt(RTTHREAD_POSIX_POKE_SIG, 1);
 
     int rc = pthread_setspecific(g_SelfKey, pThread);
@@ -154 +178 @@
     sigemptyset(&SigSet);
     sigaddset(&SigSet, SIGALRM);
+    sigdelset(&SigSet, RTTHREAD_POSIX_POKE_SIG);
     sigprocmask(SIG_BLOCK, &SigSet, NULL);
+    siginterrupt(RTTHREAD_POSIX_POKE_SIG, 1);
 
     int rc = pthread_setspecific(g_SelfKey, pThread);
@@ -302 +328 @@
     AssertReturn(pThread, VERR_INVALID_HANDLE);
 
-    int rc = pthread_kill((pthread_t)(uintptr_t)pThread->Core.Key, SIGUSR2);
+    int rc = pthread_kill((pthread_t)(uintptr_t)pThread->Core.Key, RTTHREAD_POSIX_POKE_SIG);
 
     rtThreadRelease(pThread);