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

Network/SocketPoller: Uniformize behavior accross platforms 

On Windows, a closed connection will mark as ready for read/write
This commit is contained in:
Jérôme Leclercq 2017-10-04 10:53:51 +02:00 committed by Lynix
parent d1eac591f5
commit 874599fefd
3 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Nazara/Network/Linux/SocketPollerImpl.cpp
View File

@ -111,9 +111,6 @@ namespace Nz
if (m_events[i].events & (EPOLLOUT | EPOLLERR))
m_readyToWriteSockets.insert(m_events[i].data.fd);
if (m_events[i].events & EPOLLERR)
NazaraWarning("Descriptor " + String::Number(m_events[i].data.fd) + " was returned by epoll with EPOLLERR status");
}
else
{

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

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

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

@ -143,12 +143,12 @@ namespace Nz
int socketRemaining = activeSockets;
for (PollSocket& entry : m_sockets)
{
if (entry.revents != 0)
if (entry.revents & (POLLRDNORM | POLLWRNORM | POLLHUP | POLLERR))
{
if (entry.revents & POLLRDNORM)
if (entry.revents & (POLLRDNORM | POLLHUP | POLLERR))
m_readyToReadSockets.insert(entry.fd);
if (entry.revents & POLLWRNORM)
if (entry.revents & (POLLWRNORM | POLLERR))
m_readyToWriteSockets.insert(entry.fd);
entry.revents = 0;
@ -156,6 +156,11 @@ namespace Nz
if (--socketRemaining == 0)
break;
}
else
{
NazaraWarning("Socket " + String::Number(entry.fd) + " was returned by WSAPoll without POLLRDNORM nor POLLWRNORM events (events: 0x" + String::Number(entry.events, 16) + ')');
activeSockets--;
}
}
}