pxcloud/spice
5
0
Fork 0
mirror of https://gitlab.uni-freiburg.de/opensourcevdi/spice synced 2026-01-05 03:44:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

dispatcher: Port to Windows

Browse Source 
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@redhat.com>
Acked-by: Victor Toso <victortoso@redhat.com>
This commit is contained in:
Frediano Ziglio 2018-06-24 19:29:20 +01:00
parent 524acca643
commit d0ae7f157d
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
server/dispatcher.c
View File

@ -199,6 +199,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) {
@ -211,6 +212,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);
@ -219,6 +229,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) {