Changeset 23892 in vbox for trunk/src/VBox/Runtime/r3/init.cpp

Timestamp:

Oct 20, 2009 8:55:51 AM (15 years ago)

Author:

vboxsync

Message:

temporarily back out r53642, r53640

File:

• trunk/src/VBox/Runtime/r3/init.cpp (modified) (3 diffs)

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

@@ -42 +42 @@
 # ifndef RT_OS_OS2
 #  include <pthread.h>
-#  include <signal.h>
-#  include <errno.h>
-#  define IPRT_USE_SIG_CHILD_DUMMY
 # endif
 #endif
@@ -207 +204 @@
 }
 
-
-#ifdef IPRT_USE_SIG_CHILD_DUMMY
-/**
- * Dummy SIGCHILD handler.
- *
- * Assigned on rtR3Init only when SIGCHILD handler is set SIGIGN or SIGDEF to
- * ensure waitpid works properly for the terminated processes.
- */
-static void rtR3SigChildHandler(int iSignal)
-{
-    NOREF(iSignal);
-}
-#endif /* IPRT_USE_SIG_CHILD_DUMMY */
-
-
 /**
  * rtR3Init worker.
@@ -314 +296 @@
     atexit(rtR3ExitCallback);
 
-#ifdef IPRT_USE_SIG_CHILD_DUMMY
-    /*
-     * SIGCHLD must not be ignored (that's default), otherwise posix compliant waitpid
-     * implementations won't work right.
-     */
-    for (;;)
-    {
-        struct sigaction saOld;
-        rc = sigaction(SIGCHLD, 0, &saOld);         AssertMsg(rc == 0, ("%d/%d\n", rc, errno));
-        if (    rc != 0
-            ||  (saOld.sa_flags & SA_SIGINFO)
-            || (   saOld.sa_handler != SIG_IGN
-                && saOld.sa_handler != SIG_DFL)
-           )
-            break;
-
-        /* Try install dummy handler. */
-        struct sigaction saNew = saOld;
-        saNew.sa_flags   = SA_NOCLDSTOP | SA_RESTART;
-        saNew.sa_handler = rtR3SigChildHandler;
-        rc = sigemptyset(&saNew.sa_mask);           AssertMsg(rc == 0, ("%d/%d\n", rc, errno));
-        struct sigaction saOld2;
-        rc = sigaction(SIGCHLD, &saNew, &saOld2);   AssertMsg(rc == 0, ("%d/%d\n", rc, errno));
-        if (    rc != 0
-            ||  (   saOld2.sa_handler == saOld.sa_handler
-                 && !(saOld2.sa_flags & SA_SIGINFO))
-           )
-            break;
-
-        /* Race during dynamic load, restore and try again... */
-        sigaction(SIGCHLD, &saOld2, NULL);
-        RTThreadYield();
-    }
-#endif /* IPRT_USE_SIG_CHILD_DUMMY */
-
 #ifdef IPRT_WITH_ALIGNMENT_CHECKS
     /*