Need to re-register for SIGCHLD on Solaris.

neutrinolabs · Oct 1, 2023 · 7727359 · 7727359
1 parent b508070
commit 7727359
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/common/os_calls.c b/common/os_calls.c
@@ -3087,6 +3087,7 @@ void
 g_signal_child_stop(void (*func)(int))
 {
 #if defined(_WIN32)
+    return; 
 #else
     signal(SIGCHLD, func);
 #endif
@@ -3380,19 +3381,17 @@ g_waitpid(int pid, int *stat_loc, int options)
 #else
     int rv = 0;
 
-    if (pid < 0)
-    {
-        rv = -1;
-    }
-    else
-    {
-	again:
+    again:
         rv = waitpid(pid, stat_loc, options);
 	//retry EINTR.
 	if( rv == -1 && errno == EINTR )
 	{
 	    goto again;
         }
+
+    if( rv == -1 ) 
+    {
+	LOG(LOG_LEVEL_ERROR, "waitpid returned %s", g_get_strerror());
     }
 
     return rv;

diff --git a/sesman/sesexec/sesexec.c b/sesman/sesexec/sesexec.c
@@ -220,6 +220,11 @@ set_sigchld_event(int sig)
     {
         g_set_wait_obj(g_sigchld_event);
     }
+
+#ifdef __sun
+/* On solaris we need to re-register for the signal hander. */
+    g_signal_child_stop(set_sigchld_event);
+#endif
 }
 
 /******************************************************************************/
@@ -241,6 +246,7 @@ sesexec_terminate_main_loop(int status)
 static void
 process_sigchld_event(void)
 {
+    LOG(LOG_LEVEL_TRACE, "process_sigchld_event()");
     struct exit_status e;
     int pid;
 
@@ -249,6 +255,7 @@ process_sigchld_event(void)
     {
         session_process_child_exit(g_session_data, pid, &e);
     }
+    LOG(LOG_LEVEL_TRACE, "process_sigchld_event() returned");
 }
 
 /******************************************************************************/