mirrors/SFML
1
0
Fork 0
mirror of https://github.com/SFML/SFML.git synced 2024-12-01 15:51:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Renamed SocketSelectorImpl's members to use camelCase, removed unnecessary checks from SocketSelector::add and SocketSelector::remove.

Browse Source
This commit is contained in:
binary1248 2014-07-18 10:06:44 +02:00 committed by Lukas Dürrenberger
parent eaab2c1c68
commit 3b9e246c83
1 changed files with 20 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/SFML/Network/SocketSelector.cpp
View File

@ -42,10 +42,10 @@ namespace sf
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
struct SocketSelector::SocketSelectorImpl struct SocketSelector::SocketSelectorImpl
{ {
fd_set AllSockets; ///< Set containing all the sockets handles fd_set allSockets; ///< Set containing all the sockets handles
fd_set SocketsReady; ///< Set containing handles of the sockets that are ready fd_set socketsReady; ///< Set containing handles of the sockets that are ready
int MaxSocket; ///< Maximum socket handle int maxSocket; ///< Maximum socket handle
int SocketCount; ///< Number of socket handles int socketCount; ///< Number of socket handles
}; };
@ -81,7 +81,7 @@ void SocketSelector::add(Socket& socket)
#if defined(SFML_SYSTEM_WINDOWS) #if defined(SFML_SYSTEM_WINDOWS)
if (m_impl->SocketCount >= FD_SETSIZE) if (m_impl->socketCount >= FD_SETSIZE)
{ {
err() << "The socket can't be added to the selector because the " err() << "The socket can't be added to the selector because the "
<< "selector is full. This is a limitation of your operating " << "selector is full. This is a limitation of your operating "
@ -89,10 +89,10 @@ void SocketSelector::add(Socket& socket)
return; return;
} }
if (FD_ISSET(handle, &m_impl->AllSockets)) if (FD_ISSET(handle, &m_impl->allSockets))
return; return;
m_impl->SocketCount++; m_impl->socketCount++;
#else #else
@ -104,15 +104,12 @@ void SocketSelector::add(Socket& socket)
return; return;
} }
if (FD_ISSET(handle, &m_impl->AllSockets))
return;
// SocketHandle is an int in POSIX // SocketHandle is an int in POSIX
m_impl->MaxSocket = std::max(m_impl->MaxSocket, handle); m_impl->maxSocket = std::max(m_impl->maxSocket, handle);
#endif #endif
FD_SET(handle, &m_impl->AllSockets); FD_SET(handle, &m_impl->allSockets);
} }
} }
@ -126,23 +123,20 @@ void SocketSelector::remove(Socket& socket)
#if defined(SFML_SYSTEM_WINDOWS) #if defined(SFML_SYSTEM_WINDOWS)
if (!FD_ISSET(handle, &m_impl->AllSockets)) if (!FD_ISSET(handle, &m_impl->allSockets))
return; return;
m_impl->SocketCount--; m_impl->socketCount--;
#else #else
if (handle >= FD_SETSIZE) if (handle >= FD_SETSIZE)
return; return;
if (!FD_ISSET(handle, &m_impl->AllSockets))
return;
#endif #endif
FD_CLR(handle, &m_impl->AllSockets); FD_CLR(handle, &m_impl->allSockets);
FD_CLR(handle, &m_impl->SocketsReady); FD_CLR(handle, &m_impl->socketsReady);
} }
} }
@ -150,11 +144,11 @@ void SocketSelector::remove(Socket& socket)
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
void SocketSelector::clear() void SocketSelector::clear()
{ {
FD_ZERO(&m_impl->AllSockets); FD_ZERO(&m_impl->allSockets);
FD_ZERO(&m_impl->SocketsReady); FD_ZERO(&m_impl->socketsReady);
m_impl->MaxSocket = 0; m_impl->maxSocket = 0;
m_impl->SocketCount = 0; m_impl->socketCount = 0;
} }
@ -167,11 +161,11 @@ bool SocketSelector::wait(Time timeout)
time.tv_usec = static_cast<long>(timeout.asMicroseconds() % 1000000); time.tv_usec = static_cast<long>(timeout.asMicroseconds() % 1000000);
// Initialize the set that will contain the sockets that are ready // Initialize the set that will contain the sockets that are ready
m_impl->SocketsReady = m_impl->AllSockets; m_impl->socketsReady = m_impl->allSockets;
// Wait until one of the sockets is ready for reading, or timeout is reached // Wait until one of the sockets is ready for reading, or timeout is reached
// The first parameter is ignored on Windows // The first parameter is ignored on Windows
int count = select(m_impl->MaxSocket + 1, &m_impl->SocketsReady, NULL, NULL, timeout != Time::Zero ? &time : NULL); int count = select(m_impl->maxSocket + 1, &m_impl->socketsReady, NULL, NULL, timeout != Time::Zero ? &time : NULL);
return count > 0; return count > 0;
} }
@ -191,7 +185,7 @@ bool SocketSelector::isReady(Socket& socket) const
#endif #endif
return FD_ISSET(handle, &m_impl->SocketsReady) != 0; return FD_ISSET(handle, &m_impl->socketsReady) != 0;
} }
return false; return false;