diff options
author | Thomas Huth <thuth@redhat.com> | 2024-01-22 16:33:47 +0100 |
---|---|---|
committer | Thomas Huth <thuth@redhat.com> | 2024-01-23 15:25:45 +0100 |
commit | e2c41766a9ad05b608671119661e4d8b7f53e5a2 (patch) | |
tree | 583b0205b66d369df3771a1b696f133b136c6f01 /tests | |
parent | a1f5a47b60d119859d974bed4d66db745448aac6 (diff) | |
download | qemu-e2c41766a9ad05b608671119661e4d8b7f53e5a2.zip qemu-e2c41766a9ad05b608671119661e4d8b7f53e5a2.tar.gz qemu-e2c41766a9ad05b608671119661e4d8b7f53e5a2.tar.bz2 |
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>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/unit/test-iov.c | 20 |
1 files changed, 11 insertions, 9 deletions
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 @@ 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); } |