sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SocketPoller: Fix behavior on Windows and BSD

This commit is contained in:
Jérôme Leclercq 2017-10-04 16:24:57 +02:00
parent f17be35cab
commit ecbc8343a5
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Nazara/Network/Posix/SocketPollerImpl.cpp
View File

@ -90,6 +90,9 @@ namespace Nz
int socketRemaining = activeSockets;
for (PollSocket& entry : m_sockets)
{
if (!entry.revents)
continue;
if (entry.revents & (POLLRDNORM | POLLWRNORM | POLLHUP | POLLERR))
{
if (entry.revents & (POLLRDNORM | POLLHUP | POLLERR))
@ -105,7 +108,7 @@ namespace Nz
}
else
{
NazaraWarning("Socket " + String::Number(entry.fd) + " was returned by WSAPoll without POLLRDNORM nor POLLWRNORM events (events: 0x" + String::Number(entry.events, 16) + ')');
NazaraWarning("Socket " + String::Number(entry.fd) + " was returned by WSAPoll without POLLRDNORM nor POLLWRNORM events (events: 0x" + String::Number(entry.revents, 16) + ')');
activeSockets--;
}
}

6
src/Nazara/Network/Win32/SocketPollerImpl.cpp
View File

@ -143,6 +143,9 @@ namespace Nz
int socketRemaining = activeSockets;
for (PollSocket& entry : m_sockets)
{
if (!entry.revents)
continue;
if (entry.revents & (POLLRDNORM | POLLWRNORM | POLLHUP | POLLERR))
{
if (entry.revents & (POLLRDNORM | POLLHUP | POLLERR))
@ -158,12 +161,11 @@ namespace Nz
}
else
{
NazaraWarning("Socket " + String::Number(entry.fd) + " was returned by WSAPoll without POLLRDNORM nor POLLWRNORM events (events: 0x" + String::Number(entry.events, 16) + ')');
NazaraWarning("Socket " + String::Number(entry.fd) + " was returned by WSAPoll without POLLRDNORM nor POLLWRNORM events (events: 0x" + String::Number(entry.revents, 16) + ')');
activeSockets--;
}
}
}
#else
fd_set* readSet = nullptr;
fd_set* writeSet = nullptr;