[Spice-devel] [PATCH spice-server v5 14/18] dispatcher: Port to Windows
Frediano Ziglio
fziglio at redhat.com
Fri Mar 29 09:00:10 UTC 2019
Replace poll call with select.
As socket is set to non-blocking we must support it so if
we detect an EAGAIN error wait for data.
Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
---
server/dispatcher.c | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/server/dispatcher.c b/server/dispatcher.c
index 9a49a9899..ae505efae 100644
--- a/server/dispatcher.c
+++ b/server/dispatcher.c
@@ -201,6 +201,7 @@ static int read_safe(int fd, uint8_t *buf, size_t size, int block)
}
if (!block) {
+#ifndef _WIN32
struct pollfd pollfd = {.fd = fd, .events = POLLIN, .revents = 0};
while ((ret = poll(&pollfd, 1, 0)) == -1) {
if (errno == EINTR) {
@@ -213,6 +214,15 @@ static int read_safe(int fd, uint8_t *buf, size_t size, int block)
if (!(pollfd.revents & POLLIN)) {
return 0;
}
+#else
+ struct timeval tv = { 0, 0 };
+ fd_set fds;
+ FD_ZERO(&fds);
+ FD_SET(fd, &fds);
+ if (select(1, &fds, NULL, NULL, &tv) < 1) {
+ return 0;
+ }
+#endif
}
while (read_size < size) {
ret = socket_read(fd, buf + read_size, size - read_size);
@@ -221,6 +231,16 @@ static int read_safe(int fd, uint8_t *buf, size_t size, int block)
spice_debug("EINTR in read");
continue;
}
+#ifdef _WIN32
+ // Windows turns this socket not-blocking
+ if (errno == EAGAIN) {
+ fd_set fds;
+ FD_ZERO(&fds);
+ FD_SET(fd, &fds);
+ select(1, &fds, NULL, NULL, NULL);
+ continue;
+ }
+#endif
return -1;
}
if (ret == 0) {
--
2.20.1
More information about the Spice-devel
mailing list