rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed bug in TCP socket that caused a busy loop in the socket 

multiplexer.  That caused a lock up on windows when quitting
the server with a client connected.
This commit is contained in:
crs 2004-05-04 19:37:46 +00:00
parent fdf4b2604d
commit ab0a693891
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/net/CTCPSocket.cpp
View File

@ -334,16 +334,22 @@ CTCPSocket::newJob()
{ {
// note -- must have m_mutex locked on entry // note -- must have m_mutex locked on entry
if (m_socket == NULL || !(m_readable || m_writable)) { if (m_socket == NULL) {
return NULL; return NULL;
} }
else if (!m_connected) { else if (!m_connected) {
assert(!m_readable); assert(!m_readable);
if (!(m_readable || m_writable)) {
return NULL;
}
return new TSocketMultiplexerMethodJob<CTCPSocket>( return new TSocketMultiplexerMethodJob<CTCPSocket>(
this, &CTCPSocket::serviceConnecting, this, &CTCPSocket::serviceConnecting,
m_socket, m_readable, m_writable); m_socket, m_readable, m_writable);
} }
else { else {
if (!(m_readable || (m_writable && (m_outputBuffer.getSize() > 0)))) {
return NULL;
}
return new TSocketMultiplexerMethodJob<CTCPSocket>( return new TSocketMultiplexerMethodJob<CTCPSocket>(
this, &CTCPSocket::serviceConnected, this, &CTCPSocket::serviceConnected,
m_socket, m_readable, m_socket, m_readable,