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

Timestamp:

Feb 9, 2010 1:26:17 PM (15 years ago)

Author:

vboxsync

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

57456

Message:

thread-posix.cpp: RTThreadPoke is optional, don't assert if the signal is in use. Build fix for IN_GUEST change.

File:

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

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

@@ -68 +68 @@
 /** The pthread key in which we store the pointer to our own PRTTHREAD structure. */
 static pthread_key_t    g_SelfKey;
+#ifdef RTTHREAD_POSIX_POKE_SIG
+/** Set if we can poke a thread, clear if we cannot. */
+static bool             g_fCanPokeThread;
+#endif
 
 
@@ -90 +94 @@
 #ifdef RTTHREAD_POSIX_POKE_SIG
     /*
-     * Register the dummy signal handler for RTThreadPoke.
-     * (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;
-
+     * Try register the dummy signal handler for RTThreadPoke.
+     */
+    g_fCanPokeThread = false;
     struct sigaction SigActOld;
-    if (!sigaction(RTTHREAD_POSIX_POKE_SIG, &SigAct, &SigActOld))
-        Assert(SigActOld.sa_handler == SIG_DFL);
+    if (!sigaction(RTTHREAD_POSIX_POKE_SIG, NULL, &SigActOld))
+    {
+        if (   SigActOld.sa_handler == SIG_DFL
+            || SigActOld.sa_handler == rtThreadPosixPokeSignal)
+        {
+            struct sigaction SigAct;
+            memset(&SigAct, '\0', sizeof(SigAct));
+            SigAct.sa_handler = rtThreadPosixPokeSignal;
+            sigfillset(&SigAct.sa_mask);
+            SigAct.sa_flags = 0;
+
+            /* ASSUMES no sigaction race... (lazy bird) */
+            if (!sigaction(RTTHREAD_POSIX_POKE_SIG, &SigAct, NULL))
+                g_fCanPokeThread = true;
+            else
+            {
+                AssertMsgFailed(("rc=%Rrc errno=%d\n", RTErrConvertFromErrno(errno), errno));
+                pthread_key_delete(g_SelfKey);
+                g_SelfKey = 0;
+            }
+        }
+    }
     else
-    {
-        rc = RTErrConvertFromErrno(errno);
-        AssertMsgFailed(("rc=%Rrc errno=%d\n", rc, errno));
-        pthread_key_delete(g_SelfKey);
-        g_SelfKey = 0;
-    }
+        AssertMsgFailed(("rc=%Rrc errno=%d\n", RTErrConvertFromErrno(errno), errno));
 #endif /* RTTHREAD_POSIX_POKE_SIG */
     return rc;
@@ -164 +177 @@
     sigaddset(&SigSet, SIGALRM);
     sigprocmask(SIG_BLOCK, &SigSet, NULL);
-    siginterrupt(RTTHREAD_POSIX_POKE_SIG, 1);
+#ifdef RTTHREAD_POSIX_POKE_SIG
+    if (g_fCanPokeThread)
+        siginterrupt(RTTHREAD_POSIX_POKE_SIG, 1);
+#endif
 
     int rc = pthread_setspecific(g_SelfKey, pThread);
@@ -197 +213 @@
     sigaddset(&SigSet, SIGALRM);
     sigprocmask(SIG_BLOCK, &SigSet, NULL);
-    siginterrupt(RTTHREAD_POSIX_POKE_SIG, 1);
+#ifdef RTTHREAD_POSIX_POKE_SIG
+    if (g_fCanPokeThread)
+        siginterrupt(RTTHREAD_POSIX_POKE_SIG, 1);
+#endif
 
     int rc = pthread_setspecific(g_SelfKey, pThread);
@@ -349 +368 @@
     PRTTHREADINT pThread = rtThreadGet(hThread);
     AssertReturn(pThread, VERR_INVALID_HANDLE);
-
-    int rc = pthread_kill((pthread_t)(uintptr_t)pThread->Core.Key, RTTHREAD_POSIX_POKE_SIG);
+    int rc;
+    if (g_fCanPokeThread)
+    {
+        rc = pthread_kill((pthread_t)(uintptr_t)pThread->Core.Key, RTTHREAD_POSIX_POKE_SIG);
+        rc = RTErrConvertFromErrno(rc);
+    }
+    else
+        rc = VERR_NOT_SUPPORTED;
 
     rtThreadRelease(pThread);
-    return RTErrConvertFromErrno(rc);
-}
-#endif
-
+    return rc;
+}
+#endif
+