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.
Suggested-by: "Daniel P. Berrangé" <berrange@redhat.com>
Message-ID: <20240122153347.71654-1-thuth@redhat.com>
Reviewed-by: "Daniel P. Berrangé" <berrange@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
diff --git a/tests/unit/test-iov.c b/tests/unit/test-iov.c
index 6f7623d..75bc3be 100644
--- a/tests/unit/test-iov.c
+++ b/tests/unit/test-iov.c
@@ -197,15 +197,17 @@
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);
}
