Changeset 44456 in vbox for trunk/src/VBox/Runtime/r3

Timestamp:

Jan 30, 2013 10:59:47 AM (12 years ago)

Author:

vboxsync

Message:

Runtime: add unobtrusive initialisation option which does not block SIGALRM.

Location:

trunk/src/VBox/Runtime/r3

Files:

• init.cpp (modified) (4 diffs)
• posix/thread-posix.cpp (modified) (3 diffs)
• posix/timer-posix.cpp (modified) (2 diffs)

trunk/src/VBox/Runtime/r3/init.cpp

@@ -100 +100 @@
 static char **              g_papszrtOrgArgs;
 
+/** Are we running in unobtrusive mode? */
+static bool                 g_fUnobtrusive = false;
+
 /**
  * Program start nanosecond TS.
@@ -341 +344 @@
 #endif
 
+    g_fUnobtrusive = fFlags & RTR3INIT_FLAGS_UNOBTRUSIVE;
+
 #if !defined(IN_GUEST) && !defined(RT_NO_GIP)
 # ifdef VBOX
@@ -484 +489 @@
 {
     /* no entry log flow, because prefixes and thread may freak out. */
-    Assert(!(fFlags & ~(RTR3INIT_FLAGS_DLL | RTR3INIT_FLAGS_SUPLIB)));
+    Assert(!(fFlags & ~(  RTR3INIT_FLAGS_DLL
+                        | RTR3INIT_FLAGS_SUPLIB
+                        | RTR3INIT_FLAGS_UNOBTRUSIVE)));
     Assert(!(fFlags & RTR3INIT_FLAGS_DLL) || cArgs == 0);
 
@@ -558 +565 @@
 }
 
+RTR3DECL(bool) RTR3InitIsUnobtrusive(void)
+{
+    return g_fUnobtrusive;
+}
 
 #if 0 /** @todo implement RTR3Term. */

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

@@ -63 +63 @@
 #include <iprt/asm.h>
 #include <iprt/err.h>
+#include <iprt/initterm.h>
 #include <iprt/string.h>
 #include "internal/thread.h"
@@ -149 +150 @@
 
     g_iSigPokeThread = -1;
-    for (unsigned iSig = 0; iSig < RT_ELEMENTS(s_aiSigCandidates); iSig++)
-    {
-        struct sigaction SigActOld;
-        if (!sigaction(s_aiSigCandidates[iSig], NULL, &SigActOld))
+    if (!RTR3InitIsUnobtrusive())
+    {
+        for (unsigned iSig = 0; iSig < RT_ELEMENTS(s_aiSigCandidates); iSig++)
         {
-            if (   SigActOld.sa_handler == SIG_DFL
-                || SigActOld.sa_handler == rtThreadPosixPokeSignal)
+            struct sigaction SigActOld;
+            if (!sigaction(s_aiSigCandidates[iSig], NULL, &SigActOld))
             {
-                struct sigaction SigAct;
-                RT_ZERO(SigAct);
-                SigAct.sa_handler = rtThreadPosixPokeSignal;
-                SigAct.sa_flags   = 0;
-                sigfillset(&SigAct.sa_mask);
-
-                /* ASSUMES no sigaction race... (lazy bird) */
-                if (!sigaction(s_aiSigCandidates[iSig], &SigAct, NULL))
+                if (   SigActOld.sa_handler == SIG_DFL
+                    || SigActOld.sa_handler == rtThreadPosixPokeSignal)
                 {
-                    g_iSigPokeThread = s_aiSigCandidates[iSig];
-                    break;
+                    struct sigaction SigAct;
+                    RT_ZERO(SigAct);
+                    SigAct.sa_handler = rtThreadPosixPokeSignal;
+                    SigAct.sa_flags   = 0;
+                    sigfillset(&SigAct.sa_mask);
+
+                    /* ASSUMES no sigaction race... (lazy bird) */
+                    if (!sigaction(s_aiSigCandidates[iSig], &SigAct, NULL))
+                    {
+                        g_iSigPokeThread = s_aiSigCandidates[iSig];
+                        break;
+                    }
+                    AssertMsgFailed(("rc=%Rrc errno=%d\n", RTErrConvertFromErrno(errno), errno));
                 }
+            }
+            else
                 AssertMsgFailed(("rc=%Rrc errno=%d\n", RTErrConvertFromErrno(errno), errno));
-            }
         }
-        else
-            AssertMsgFailed(("rc=%Rrc errno=%d\n", RTErrConvertFromErrno(errno), errno));
     }
 #endif /* RTTHREAD_POSIX_WITH_POKE */
@@ -231 +235 @@
      * It will not help much if someone creates threads directly using pthread_create. :/
      */
-    sigset_t SigSet;
-    sigemptyset(&SigSet);
-    sigaddset(&SigSet, SIGALRM);
-    sigprocmask(SIG_BLOCK, &SigSet, NULL);
+    if (!RTR3InitIsUnobtrusive())
+    {
+        sigset_t SigSet;
+        sigemptyset(&SigSet);
+        sigaddset(&SigSet, SIGALRM);
+        sigprocmask(SIG_BLOCK, &SigSet, NULL);
+    }
 #ifdef RTTHREAD_POSIX_WITH_POKE
     if (g_iSigPokeThread != -1)

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

@@ -58 +58 @@
 #include <iprt/once.h>
 #include <iprt/err.h>
+#include <iprt/initterm.h>
 #include <iprt/critsect.h>
 #include "internal/magics.h"
@@ -405 +406 @@
         return VERR_NOT_SUPPORTED;
 
+    /*
+     * We need the signal masks to be set correctly, which they won't be in
+     * unobtrusive mode.
+     */
+    if (RTR3InitIsUnobtrusive())
+        return VERR_NOT_SUPPORTED;
+
 #ifndef IPRT_WITH_POSIX_TIMERS
     /*