[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v5 13/18] tests/qtest: libqtest: Correct the timeout unit of bloc
From: |
Bin Meng |
Subject: |
[PATCH v5 13/18] tests/qtest: libqtest: Correct the timeout unit of blocking receive calls for win32 |
Date: |
Thu, 6 Oct 2022 23:19:22 +0800 |
From: Bin Meng <bin.meng@windriver.com>
Some qtest cases don't get response from the QEMU executable under
test in time on Windows. It turns out that the socket receive call
got timeout before it receive the complete response.
The timeout value is supposed to be set to 50 seconds via the
setsockopt() call, but there is a difference among platforms.
The timeout unit of blocking receive calls is measured in
seconds on non-Windows platforms but milliseconds on Windows.
Signed-off-by: Bin Meng <bin.meng@windriver.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
(no changes since v1)
tests/qtest/libqtest.c | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/tests/qtest/libqtest.c b/tests/qtest/libqtest.c
index ecd22cdb11..d52883c361 100644
--- a/tests/qtest/libqtest.c
+++ b/tests/qtest/libqtest.c
@@ -36,13 +36,14 @@
#include "qapi/qmp/qstring.h"
#define MAX_IRQ 256
-#define SOCKET_TIMEOUT 50
#ifndef _WIN32
+# define SOCKET_TIMEOUT 50
# define CMD_EXEC "exec "
# define DEV_STDERR "/dev/fd/2"
# define DEV_NULL "/dev/null"
#else
+# define SOCKET_TIMEOUT 50000
# define CMD_EXEC ""
# define DEV_STDERR "2"
# define DEV_NULL "nul"
@@ -103,8 +104,16 @@ static int socket_accept(int sock)
struct sockaddr_un addr;
socklen_t addrlen;
int ret;
+ /*
+ * timeout unit of blocking receive calls is different among platfoms.
+ * It's in seconds on non-Windows platforms but milliseconds on Windows.
+ */
+#ifndef _WIN32
struct timeval timeout = { .tv_sec = SOCKET_TIMEOUT,
.tv_usec = 0 };
+#else
+ DWORD timeout = SOCKET_TIMEOUT;
+#endif
if (setsockopt(sock, SOL_SOCKET, SO_RCVTIMEO,
(void *)&timeout, sizeof(timeout))) {
--
2.34.1
- Re: [PATCH v5 12/18] tests/qtest: migration-test: Make sure QEMU process "to" exited after migration is canceled, (continued)
- [PATCH v5 14/18] io/channel-watch: Drop a superfluous '#ifdef WIN32', Bin Meng, 2022/10/06
- [PATCH v5 17/18] .gitlab-ci.d/windows.yml: Increase the timeout to 90 minutes, Bin Meng, 2022/10/06
- [PATCH v5 15/18] io/channel-watch: Drop the unnecessary cast, Bin Meng, 2022/10/06
- [PATCH v5 11/18] tests/qtest: Support libqtest to build and run on Windows, Bin Meng, 2022/10/06
- [PATCH v5 13/18] tests/qtest: libqtest: Correct the timeout unit of blocking receive calls for win32,
Bin Meng <=
- [PATCH v5 16/18] io/channel-watch: Fix socket watch on Windows, Bin Meng, 2022/10/06
- [PATCH v5 18/18] tests/qtest: Enable qtest build on Windows, Bin Meng, 2022/10/06
- Re: [PATCH v5 00/18] tests/qtest: Enable running qtest on Windows, Alex Bennée, 2022/10/06