eeva/jamulus
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bug fix for the server (fixed a dead lock)

Browse Source
This commit is contained in:
Volker Fischer 2013-08-18 15:22:18 +00:00
parent dcc4f0596f
commit 0d93612214
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/socket.cpp
View File

@ -71,14 +71,25 @@ void CSocket::Init ( const quint16 iPortNumber )
// connect the "activated" signal // connect the "activated" signal
#ifdef ENABLE_RECEIVE_SOCKET_IN_SEPARATE_THREAD #ifdef ENABLE_RECEIVE_SOCKET_IN_SEPARATE_THREAD
// We have to use a blocked queued connection since in case we use a if ( bIsClient )
// separate socket thread, the "readyRead" signal would occur and our {
// "OnDataReceived" function would be run in another thread. This could // We have to use a blocked queued connection since in case we use a
// lead to a situation that a new "readRead" occurs while the processing // separate socket thread, the "readyRead" signal would occur and our
// of the previous signal was not finished -> the error: "Multiple // "OnDataReceived" function would be run in another thread. This could
// socket notifiers for same socket" may occur. // lead to a situation that a new "readRead" occurs while the processing
QObject::connect ( &SocketDevice, SIGNAL ( readyRead() ), // of the previous signal was not finished -> the error: "Multiple
this, SLOT ( OnDataReceived() ), Qt::BlockingQueuedConnection ); // socket notifiers for same socket" may occur.
QObject::connect ( &SocketDevice, SIGNAL ( readyRead() ),
this, SLOT ( OnDataReceived() ), Qt::BlockingQueuedConnection );
}
else
{
// the server does not use a separate socket thread right now, in that
// case we must not use the blocking queued connection, otherwise we
// would get a dead lock
QObject::connect ( &SocketDevice, SIGNAL ( readyRead() ),
this, SLOT ( OnDataReceived() ) );
}
#else #else
QObject::connect ( &SocketDevice, SIGNAL ( readyRead() ), QObject::connect ( &SocketDevice, SIGNAL ( readyRead() ),
this, SLOT ( OnDataReceived() ) ); this, SLOT ( OnDataReceived() ) );