Merge branch 'mr/jicquel/gnatcoll-core#138' into 'master'

Prevent infinite loop in wait_for_processes__unix

Closes #138

See merge request eng/toolchain/gnatcoll-core!209

Author: Jicquel

core/src/os/unix/process-wrappers.c

@@ -87,8 +87,8 @@ int __gnatcoll_remove_monitoring_fd (int fd)
 int __gnatcoll_wait_for_sigchld (int fd, sint_64 timeout)
 {
    fd_set fd_list;
-   struct timeval tv;
-   struct timeval *effective_timeout;
+   struct timeval tv = {0, 0};
+   struct timeval *effective_timeout = NULL;
    int retval = 0;
    char buf[1];
 
@@ -103,7 +103,7 @@ int __gnatcoll_wait_for_sigchld (int fd, sint_64 timeout)
       effective_timeout = &tv;
    }
 
-   while (tv.tv_sec > 0 || tv.tv_usec > 0) {
+   while (tv.tv_sec > 0 || tv.tv_usec > 0 || effective_timeout == NULL) {
       retval = select(fd + 1, &fd_list, NULL, NULL, effective_timeout);
       if (retval > 0)
       {

testsuite/core/tests/os/process/wait_for_processes/test.adb

@@ -33,7 +33,7 @@ begin
 
    Result2 := Wait_For_Processes (Processes => (H1, H2), Timeout => 5.0);
    A.Assert (Result2 /= Invalid_Handle, "a process should be available");
-   A.Assert (Result1 /= Result2, "Resutl1 should be different from Result2");
+   A.Assert (Result1 /= Result2, "Result1 should be different from Result2");
    if Result2 /= Invalid_Handle then
       Status := Wait (Result2);
       A.Assert (Status, 42, "exit status should be 42");
@@ -72,5 +72,23 @@ begin
       A.Assert (Status, 42, "exit status should be 42");
    end if;
 
+   H1 := Start (Args);
+   H2 := Start (Args);
+
+   Result1 := Wait_For_Processes (Processes => (H1, H2));
+   A.Assert (Result1 /= Invalid_Handle, "a process should be available");
+   if Result1 /= Invalid_Handle then
+      Status := Wait (Result1);
+      A.Assert (Status, 42, "exit status should be 42");
+   end if;
+
+   Result2 := Wait_For_Processes (Processes => (H1, H2));
+   A.Assert (Result2 /= Invalid_Handle, "a process should be available");
+   A.Assert (Result1 /= Result2, "Result1 should be different from Result2");
+   if Result2 /= Invalid_Handle then
+      Status := Wait (Result2);
+      A.Assert (Status, 42, "exit status should be 42");
+   end if;
+
    return A.Report;
 end Test;