flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

SocketThreads: Removed unused code.

Browse Source
This commit is contained in:
madmaxoft 2014-01-18 20:50:16 +01:00
parent 2a4fa72d10
commit dc70d04cdd
2 changed files with 3 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/OSSupport/SocketThreads.cpp
View File

@ -71,29 +71,6 @@ bool cSocketThreads::AddClient(const cSocket & a_Socket, cCallback * a_Client)
/*
void cSocketThreads::RemoveClient(const cSocket * a_Socket)
{
// Remove the socket (and associated client) from processing
cCSLock Lock(m_CS);
for (cSocketThreadList::iterator itr = m_Threads.begin(); itr != m_Threads.end(); ++itr)
{
if ((*itr)->RemoveSocket(a_Socket))
{
return;
}
} // for itr - m_Threads[]
// Cannot assert here, this may actually happen legally, since cClientHandle has to clean up the socket and it may have already closed in the meantime
// ASSERT(!"Removing an unknown socket");
}
*/
void cSocketThreads::RemoveClient(const cCallback * a_Client) void cSocketThreads::RemoveClient(const cCallback * a_Client)
{ {
// Remove the associated socket and the client from processing // Remove the associated socket and the client from processing
@ -284,34 +261,6 @@ bool cSocketThreads::cSocketThread::RemoveClient(const cCallback * a_Client)
bool cSocketThreads::cSocketThread::RemoveSocket(const cSocket * a_Socket)
{
// Returns true if removed, false if not found
for (int i = m_NumSlots - 1; i >= 0 ; --i)
{
if (m_Slots[i].m_Socket != *a_Socket)
{
continue;
}
// Found, remove it:
m_Slots[i] = m_Slots[--m_NumSlots];
// Notify the thread of the change:
ASSERT(m_ControlSocket2.IsValid());
m_ControlSocket2.Send("r", 1);
return true;
} // for i - m_Slots[]
// Not found
return false;
}
bool cSocketThreads::cSocketThread::HasClient(const cCallback * a_Client) const bool cSocketThreads::cSocketThread::HasClient(const cCallback * a_Client) const
{ {
for (int i = m_NumSlots - 1; i >= 0; --i) for (int i = m_NumSlots - 1; i >= 0; --i)

5
src/OSSupport/SocketThreads.h
View File

@ -81,7 +81,9 @@ public:
/// Add a (socket, client) pair for processing, data from a_Socket is to be sent to a_Client; returns true if successful /// Add a (socket, client) pair for processing, data from a_Socket is to be sent to a_Client; returns true if successful
bool AddClient(const cSocket & a_Socket, cCallback * a_Client); bool AddClient(const cSocket & a_Socket, cCallback * a_Client);
/// Remove the associated socket and the client from processing. The socket is left to send its data and is removed only after all its m_OutgoingData is sent /** Remove the associated socket and the client from processing.
The socket is left to send its data and is removed only after all its m_OutgoingData is sent
*/
void RemoveClient(const cCallback * a_Client); void RemoveClient(const cCallback * a_Client);
/// Notify the thread responsible for a_Client that the client has something to write /// Notify the thread responsible for a_Client that the client has something to write
@ -114,7 +116,6 @@ private:
void AddClient (const cSocket & a_Socket, cCallback * a_Client); // Takes ownership of the socket void AddClient (const cSocket & a_Socket, cCallback * a_Client); // Takes ownership of the socket
bool RemoveClient(const cCallback * a_Client); // Returns true if removed, false if not found bool RemoveClient(const cCallback * a_Client); // Returns true if removed, false if not found
bool RemoveSocket(const cSocket * a_Socket); // Returns true if removed, false if not found
bool HasClient (const cCallback * a_Client) const; bool HasClient (const cCallback * a_Client) const;
bool HasSocket (const cSocket * a_Socket) const; bool HasSocket (const cSocket * a_Socket) const;
bool NotifyWrite (const cCallback * a_Client); // Returns true if client handled by this thread bool NotifyWrite (const cCallback * a_Client); // Returns true if client handled by this thread