tests/unit/test-iov: Fix timeout problem on NetBSD and OpenBSD
PATCH 1/1 tests/unit/test-iov: Fix timeout problem on NetBSD and OpenBSD
The test-iov code uses usleep() with small values (<= 30) in some nested loops with many iterations. This causes a small delay on OSes like Linux that have a precise sleeping mechanism, but on systems like NetBSD and OpenBSD, each usleep() call takes multiple microseconds, which then sum up in a total test time of multiple minutes!
Looking at the code, the usleep() does not really seem to be necessary here - if not enough data could be send, we should simply always use select() to wait 'til we can send more. Thus remove the usleep() and re-arrange the code a little bit to make it more clear what is going on here.
--- tests/unit/test-iov.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-)
tests/unit/test-iov.c +11 -9
@@ -197,15 +197,17 @@ static void test_io(void) s =g_test_rand_int_range (0 , j - k +1 ); r =iov_send (sv[1 ], iov, niov, k, s);g_assert (memcmp (iov, siov,sizeof (*iov)*niov) ==0 ); -if (r >=0 ) { - k += r; -usleep (g_test_rand_int_range (0 ,30 )); - }else if (errno ==EAGAIN ) { -select (sv[1 ]+1 ,NULL , &fds,NULL ,NULL ); -continue ; - }else { -perror ("send" ); -exit (1 ); +if (r <0 ) { +if (errno ==EAGAIN ) { + r =0 ; + }else { +perror ("send" ); +exit (1 ); + } + } + k += r; +if (k < j) { +select (sv[1 ] +1 ,NULL , &fds,NULL ,NULL ); } }while (k < j); }
Signature · 1 line
2.43.0
Quoted 12 lines · Thomas Huth
The test-iov code uses
usleep()with small values (<= 30) in some nested loops with many iterations. This causes a small delay on OSes like Linux that have a precise sleeping mechanism, but on systems like NetBSD and OpenBSD, eachusleep()call takes multiple microseconds, which then sum up in a total test time of multiple minutes!Looking at the code, the
usleep()does not really seem to be necessary here - if not enough data could be send, we should simply always useselect()to wait 'til we can send more. Thus remove theusleep()and re-arrange the code a little bit to make it more clear what is going on here.
Quoted 5 lines
Suggested-by Daniel P. Berrangé <[email protected]>Signed-off-by Thomas Huth <[email protected]>--- tests/unit/test-iov.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-)
With regards,
Daniel
Signature · 3 lines
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|