rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-20 10:54:14 +01:00
Code Issues Releases Activity

IPConnection telemetry module: Rev 1342 introduced a serious deadlock bug due to incorrect usage of QReadLock where a QMutex should have been used.

Browse Source 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@1970 ebee16cc-31ac-478f-84a7-5cbb03baadba
This commit is contained in:
corvus 2010-10-16 22:29:19 +00:00 committed by corvus
parent 41388d97bd
commit ff87e8bd79
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ground/src/plugins/ipconnection/ipconnectionplugin.cpp
View File

@ -41,6 +41,7 @@
#include <QtNetwork/QTcpSocket>
#include <QtNetwork/QUdpSocket>
#include <QWaitCondition>
#include <QMutex>
#include <coreplugin/threadmanager.h>
#include <QDebug>
@ -48,7 +49,9 @@
//Communication between IPconnectionConnection::OpenDevice() and IPConnection::onOpenDevice()
QString errorMsg;
QWaitCondition openDeviceWait;
QReadWriteLock dummyLock;
QWaitCondition closeDeviceWait;
//QReadWriteLock dummyLock;
QMutex ipConMutex;
QAbstractSocket *ret;
IPConnection::IPConnection(IPconnectionConnection *connection) : QObject()
@ -72,6 +75,7 @@ void IPConnection::onOpenDevice(QString HostName, int Port, bool UseTCP)
const int Timeout = 5 * 1000;
int state;
ipConMutex.lock();
if (UseTCP) {
ipSocket = new QTcpSocket(this);
} else {
@ -91,6 +95,7 @@ void IPConnection::onOpenDevice(QString HostName, int Port, bool UseTCP)
if (ipSocket->waitForConnected(Timeout)) {
ret = ipSocket;
openDeviceWait.wakeAll();
ipConMutex.unlock();
return;
}
//tell user something went wrong
@ -100,12 +105,16 @@ void IPConnection::onOpenDevice(QString HostName, int Port, bool UseTCP)
* someone needs to debug this, I got lost in the calling chain.*/
ret = NULL;
openDeviceWait.wakeAll();
ipConMutex.unlock();
}
void IPConnection::onCloseDevice(QAbstractSocket *ipSocket)
{
ipConMutex.lock();
ipSocket->close ();
delete(ipSocket);
closeDeviceWait.wakeAll();
ipConMutex.unlock();
}
@ -175,13 +184,17 @@ QIODevice *IPconnectionConnection::openDevice(const QString &deviceName)
if (ipSocket){
//Andrew: close any existing socket... this should never occur
ipConMutex.lock();
emit CloseSocket(ipSocket);
closeDeviceWait.wait(&ipConMutex);
ipConMutex.unlock();
ipSocket = NULL;
}
dummyLock.lockForRead();
ipConMutex.lock();
emit CreateSocket(HostName, Port, UseTCP);
openDeviceWait.wait(&dummyLock);
openDeviceWait.wait(&ipConMutex);
ipConMutex.unlock();
ipSocket = ret;
if(ipSocket == NULL)
{
@ -194,7 +207,10 @@ QIODevice *IPconnectionConnection::openDevice(const QString &deviceName)
void IPconnectionConnection::closeDevice(const QString &deviceName)
{
if (ipSocket){
ipConMutex.lock();
emit CloseSocket(ipSocket);
closeDeviceWait.wait(&ipConMutex);
ipConMutex.unlock();
ipSocket = NULL;
}
}