diff mbox series

misc: tst-poll: Proper synchronize with child before sending the signal

Message ID 20240126112341.2286758-1-adhemerval.zanella@linaro.org
State Committed
Commit 26d01172f5c3f3b912ecf21ebb911eb5351bba4d
Headers
Series misc: tst-poll: Proper synchronize with child before sending the signal |

Checks

Context Check Description
redhat-pt-bot/TryBot-apply_patch success Patch applied to master at the time it was sent
redhat-pt-bot/TryBot-32bit success Build for i686
linaro-tcwg-bot/tcwg_glibc_build--master-arm success Testing passed
linaro-tcwg-bot/tcwg_glibc_check--master-arm success Testing passed
linaro-tcwg-bot/tcwg_glibc_build--master-aarch64 success Testing passed
linaro-tcwg-bot/tcwg_glibc_check--master-aarch64 success Testing passed

Commit Message

Adhemerval Zanella Netto Jan. 26, 2024, 11:23 a.m. UTC 
  When running the testsuite in parallel, for instance running make -j
$(nproc) check, occasionally tst-epoll fails with a timeout.  It happens
because it sometimes takes a bit more than 10ms for the process to get
cloned and blocked by the syscall.  In that case the signal is
sent to early, and the test fails with a timeout.

Checked on x86_64-linux-gnu.
---
 sysdeps/unix/sysv/linux/tst-epoll.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Florian Weimer Jan. 26, 2024, 12:02 p.m. UTC | #1 
* Adhemerval Zanella:

> When running the testsuite in parallel, for instance running make -j
> $(nproc) check, occasionally tst-epoll fails with a timeout.  It happens
> because it sometimes takes a bit more than 10ms for the process to get
> cloned and blocked by the syscall.  In that case the signal is
> sent to early, and the test fails with a timeout.
>
> Checked on x86_64-linux-gnu.
> ---
>  sysdeps/unix/sysv/linux/tst-epoll.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/sysdeps/unix/sysv/linux/tst-epoll.c b/sysdeps/unix/sysv/linux/tst-epoll.c
> index 3b38beae6e..545f506faa 100644
> --- a/sysdeps/unix/sysv/linux/tst-epoll.c
> +++ b/sysdeps/unix/sysv/linux/tst-epoll.c
> @@ -22,7 +22,7 @@
>  #include <support/support.h>
>  #include <support/xsignal.h>
>  #include <support/xunistd.h>
> -#include <support/xtime.h>
> +#include <support/process_state.h>
>  #include <stdlib.h>
>  #include <sys/epoll.h>
>  
> @@ -97,8 +97,8 @@ test_epoll_basic (epoll_wait_check_t epoll_wait_check)
>    xclose (fds[0][0]);
>    xclose (fds[1][1]);
>  
> -  /* Wait some time so child is blocked on the syscall.  */
> -  nanosleep (&(struct timespec) {0, 10000000}, NULL);
> +  /* Wait until child is blocked on epoll_wait.  */
> +  support_process_state_wait (p, support_process_state_sleeping);
>    TEST_COMPARE (kill (p, SIGUSR1), 0);
>  
>    int e = epoll_wait_check (efd, &event, 1, 500000000, &ss);

Looks okay.  I don't see any blocking system calls between the fork and
the epoll_wait call.

Thanks,
Florian
Aurelien Jarno Feb. 9, 2024, 5:54 p.m. UTC | #2 
On 2024-01-26 08:23, Adhemerval Zanella wrote:
> When running the testsuite in parallel, for instance running make -j
> $(nproc) check, occasionally tst-epoll fails with a timeout.  It happens
> because it sometimes takes a bit more than 10ms for the process to get
> cloned and blocked by the syscall.  In that case the signal is
> sent to early, and the test fails with a timeout.
> 
> Checked on x86_64-linux-gnu.
> ---
>  sysdeps/unix/sysv/linux/tst-epoll.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/sysdeps/unix/sysv/linux/tst-epoll.c b/sysdeps/unix/sysv/linux/tst-epoll.c
> index 3b38beae6e..545f506faa 100644
> --- a/sysdeps/unix/sysv/linux/tst-epoll.c
> +++ b/sysdeps/unix/sysv/linux/tst-epoll.c
> @@ -22,7 +22,7 @@
>  #include <support/support.h>
>  #include <support/xsignal.h>
>  #include <support/xunistd.h>
> -#include <support/xtime.h>
> +#include <support/process_state.h>
>  #include <stdlib.h>
>  #include <sys/epoll.h>
>  
> @@ -97,8 +97,8 @@ test_epoll_basic (epoll_wait_check_t epoll_wait_check)
>    xclose (fds[0][0]);
>    xclose (fds[1][1]);
>  
> -  /* Wait some time so child is blocked on the syscall.  */
> -  nanosleep (&(struct timespec) {0, 10000000}, NULL);
> +  /* Wait until child is blocked on epoll_wait.  */
> +  support_process_state_wait (p, support_process_state_sleeping);
>    TEST_COMPARE (kill (p, SIGUSR1), 0);
>  
>    int e = epoll_wait_check (efd, &event, 1, 500000000, &ss);

Thanks for working on the patch and sorry for taking so long to test
it. There is a minor typo on the subject (poll -> epoll), but otherwise
works as expected, so:

Tested-by: Aurelien Jarno <aurelien@aurel32.net>
diff mbox series

Patch

diff --git a/sysdeps/unix/sysv/linux/tst-epoll.c b/sysdeps/unix/sysv/linux/tst-epoll.c
index 3b38beae6e..545f506faa 100644
--- a/sysdeps/unix/sysv/linux/tst-epoll.c
+++ b/sysdeps/unix/sysv/linux/tst-epoll.c
@@ -22,7 +22,7 @@ 
 #include <support/support.h>
 #include <support/xsignal.h>
 #include <support/xunistd.h>
-#include <support/xtime.h>
+#include <support/process_state.h>
 #include <stdlib.h>
 #include <sys/epoll.h>
 
@@ -97,8 +97,8 @@  test_epoll_basic (epoll_wait_check_t epoll_wait_check)
   xclose (fds[0][0]);
   xclose (fds[1][1]);
 
-  /* Wait some time so child is blocked on the syscall.  */
-  nanosleep (&(struct timespec) {0, 10000000}, NULL);
+  /* Wait until child is blocked on epoll_wait.  */
+  support_process_state_wait (p, support_process_state_sleeping);
   TEST_COMPARE (kill (p, SIGUSR1), 0);
 
   int e = epoll_wait_check (efd, &event, 1, 500000000, &ss);