aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

server deadlock fix

Browse source
This commit is contained in:
Max-Wilhelm Bruker 2013-01-26 16:34:24 +01:00
parent 14287e54f9
commit 8d596619e7
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
servatrice/src/serversocketinterface.cpp
View file

@ -189,7 +189,8 @@ void ServerSocketInterface::flushOutputQueue()
int totalBytes = 0; int totalBytes = 0;
while (!outputQueue.isEmpty()) { while (!outputQueue.isEmpty()) {
const ServerMessage &item = outputQueue.first(); ServerMessage item = outputQueue.takeFirst();
locker.unlock();
QByteArray buf; QByteArray buf;
unsigned int size = item.ByteSize(); unsigned int size = item.ByteSize();
@ -199,10 +200,11 @@ void ServerSocketInterface::flushOutputQueue()
buf.data()[2] = (unsigned char) (size >> 8); buf.data()[2] = (unsigned char) (size >> 8);
buf.data()[1] = (unsigned char) (size >> 16); buf.data()[1] = (unsigned char) (size >> 16);
buf.data()[0] = (unsigned char) (size >> 24); buf.data()[0] = (unsigned char) (size >> 24);
// In case socket->write() calls catchSocketError(), the mutex must not be locked during this call.
socket->write(buf); socket->write(buf);
totalBytes += size + 4; totalBytes += size + 4;
outputQueue.removeFirst(); locker.relock();
} }
servatrice->incTxBytes(totalBytes); servatrice->incTxBytes(totalBytes);
socket->flush(); socket->flush();