moonlight-stream/moonlight-common-c
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-common-c.git synced 2025-08-18 09:25:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update pollSockets() fallback for Vita compatibility

Browse Source
This commit is contained in:
Cameron Gutman 2020-10-22 17:20:07 -05:00
parent 4f42188c1f
commit f15582a090
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/PlatformSockets.c
View File

@ -78,20 +78,21 @@ void setRecvTimeout(SOCKET s, int timeoutSec) {
} }
int pollSockets(struct pollfd* pollFds, int pollFdsCount, int timeoutMs) { int pollSockets(struct pollfd* pollFds, int pollFdsCount, int timeoutMs) {
#ifdef LC_WINDOWS #if defined(LC_WINDOWS) || defined(__vita__)
// We could have used WSAPoll() but it has some nasty bugs // We could have used WSAPoll() but it has some nasty bugs
// https://daniel.haxx.se/blog/2012/10/10/wsapoll-is-broken/ // https://daniel.haxx.se/blog/2012/10/10/wsapoll-is-broken/
// //
// We'll emulate WSAPoll() with select(). Fortunately, Microsoft's definition // We'll emulate WSAPoll() with select(). Fortunately, Microsoft's definition
// of fd_set does not have the same stack corruption hazards that UNIX does. // of fd_set does not have the same stack corruption hazards that UNIX does.
fd_set readFds, writeFds, exceptFds; fd_set readFds, writeFds, exceptFds;
int i, err; int i, err, nfds;
struct timeval tv; struct timeval tv;
FD_ZERO(&readFds); FD_ZERO(&readFds);
FD_ZERO(&writeFds); FD_ZERO(&writeFds);
FD_ZERO(&exceptFds); FD_ZERO(&exceptFds);
nfds = 0;
for (i = 0; i < pollFdsCount; i++) { for (i = 0; i < pollFdsCount; i++) {
// Clear revents on input like poll() does // Clear revents on input like poll() does
pollFds[i].revents = 0; pollFds[i].revents = 0;
@ -102,17 +103,25 @@ int pollSockets(struct pollfd* pollFds, int pollFdsCount, int timeoutMs) {
if (pollFds[i].events & POLLOUT) { if (pollFds[i].events & POLLOUT) {
FD_SET(pollFds[i].fd, &writeFds); FD_SET(pollFds[i].fd, &writeFds);
#ifdef LC_WINDOWS
// Windows signals failed connections as an exception, // Windows signals failed connections as an exception,
// while Linux signals them as writeable. // while Linux signals them as writeable.
FD_SET(pollFds[i].fd, &exceptFds); FD_SET(pollFds[i].fd, &exceptFds);
#endif
} }
#ifndef LC_WINDOWS
// nfds is unused on Windows
if (pollFds[i].fd >= nfds) {
nfds = pollFds[i].fd + 1;
}
#endif
} }
tv.tv_sec = timeoutMs / 1000; tv.tv_sec = timeoutMs / 1000;
tv.tv_usec = (timeoutMs % 1000) * 1000; tv.tv_usec = (timeoutMs % 1000) * 1000;
// nfds is unused on Windows err = select(nfds, &readFds, &writeFds, &exceptFds, timeoutMs >= 0 ? &tv : NULL);
err = select(0, &readFds, &writeFds, &exceptFds, timeoutMs >= 0 ? &tv : NULL);
if (err <= 0) { if (err <= 0) {
// Error or timeout // Error or timeout
return err; return err;