Changeset 75726 in vbox

Timestamp:

Nov 25, 2018 8:12:28 PM (6 years ago)

Author:

vboxsync

Message:

VBoxService: Added SIGCHLD to sigwait() call to make darwin (10.9.5) work. Got woken up with the first set signal in signalMask otherwise, causing the daemon to quit. (Only happens with --only-control and after blocking SIGCHLD while doing HGCM message getting from the host.)

File:

• trunk/src/VBox/Additions/common/VBoxService/VBoxService.cpp (modified) (3 diffs)

trunk/src/VBox/Additions/common/VBoxService/VBoxService.cpp

@@ -844 +844 @@
      * The annoying EINTR/ERESTART loop is for the benefit of Solaris where
      * sigwait returns when we receive a SIGCHLD.  Kind of makes sense since
+     * the signal has to be delivered...  Anyway, darwin (10.9.5) has a much
+     * worse way of dealing with SIGCHLD, apparently it'll just return any
+     * of the signals we're waiting on when SIGCHLD becomes pending on this
+     * thread. So, we wait for SIGCHLD here and ignores it.
      */
     sigset_t signalMask;
@@ -852 +856 @@
     sigaddset(&signalMask, SIGABRT);
     sigaddset(&signalMask, SIGTERM);
+    sigaddset(&signalMask, SIGCHLD);
     pthread_sigmask(SIG_BLOCK, &signalMask, NULL);
 
@@ -864 +869 @@
            || rc == ERESTART
 # endif
+           || iSignal == SIGCHLD
           );