create a signal thread to distribute SIGCHLD as SIGUSR1

1 files changed, 7 insertions, 2 deletions

diff --git a/mac/arch.c b/mac/arch.c
index 43e0b8ae..23869a16 100644
--- a/mac/arch.c
+++ b/mac/arch.c
@@ -382,11 +382,16 @@ void arch_reapChild(run_t* run) {
             if (r == -1 && errno != EINTR) {
                 PLOG_F("poll(fd=%d)", run->persistentSock);
             }
+        } else {
+            /* Return with SIGIO, SIGCHLD and with SIGUSR1 */
+            int sig = sigwaitinfo(&run->global->exe.waitSigSet, NULL);
+            if (sig == -1 && (errno != EAGAIN && errno != EINTR)) {
+                PLOG_F("sigwaitinfo(SIGIO|SIGCHLD|SIGUSR1)");
+            }
         }
 
         int status;
-        int flags = run->global->exe.persistent ? WNOHANG : 0;
-        int ret = waitpid(run->pid, &status, flags);
+        int ret = waitpid(run->pid, &status, WNOHANG);
         if (ret == 0) {
             continue;
         }