Merge branch 'eyraud/fix_wait_for_processes' into 'master'

Jugst3r · Jugst3r · commit 125102967195 · 2024-04-02T10:43:00.000Z
Fixes in GNATCOLL.OS.Process.Wait_For_Processes Closes #45 See merge request eng/toolchain/gnatcoll-core!91
diff --git a/src/os/unix/process-wrappers.c b/src/os/unix/process-wrappers.c
@@ -104,7 +104,7 @@ int __gnatcoll_wait_for_sigchld (int fd, sint_64 timeout)
    }
 
    while (tv.tv_sec > 0 || tv.tv_usec > 0) {
-      retval = select(fd + 1, &fd_list, NULL, NULL, &tv);
+      retval = select(fd + 1, &fd_list, NULL, NULL, effective_timeout);
       if (retval > 0)
       {
          read (fd, buf, 1);
@@ -129,7 +129,7 @@ int __gnatcoll_init_sigchld_monitoring()
    struct sigaction action;
    action.sa_handler = __gnatcoll_write_on_sigchld;
    sigemptyset(&action.sa_mask);
-   action.sa_flags = 0;
+   action.sa_flags = SA_RESTART;
    return sigaction (SIGCHLD, &action, NULL);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ int __gnatcoll_wait_for_sigchld (int fd, sint_64 timeout)`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`while (tv.tv_sec > 0 \|\| tv.tv_usec > 0) {`
`107`		`- retval = select(fd + 1, &fd_list, NULL, NULL, &tv);`
	`107`	`+ retval = select(fd + 1, &fd_list, NULL, NULL, effective_timeout);`
`108`	`108`	`if (retval > 0)`
`109`	`109`	`{`
`110`	`110`	`read (fd, buf, 1);`
`@@ -129,7 +129,7 @@ int __gnatcoll_init_sigchld_monitoring()`
`129`	`129`	`struct sigaction action;`
`130`	`130`	`action.sa_handler = __gnatcoll_write_on_sigchld;`
`131`	`131`	`sigemptyset(&action.sa_mask);`
`132`		`- action.sa_flags = 0;`
	`132`	`+ action.sa_flags = SA_RESTART;`
`133`	`133`	`return sigaction (SIGCHLD, &action, NULL);`
`134`	`134`	`}`
`135`	`135`