feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDebug: Queue the socket error and disconnect signals

Browse Source 
Apparently these can be sent synchronously on trying to send something
over the wire. Synchronously handling the signals at that point is
dangerous as the rest of the system might be in some transitional state
(e.g. just destroying the clients).

Fixes: QTCREATORBUG-22640
Change-Id: I21a0c92a6334d401390cf6d92b9b855b83cc6307
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Ulf Hermann
2019-06-29 11:02:51 +02:00
parent 7cd504511c
commit 5daae2cf6c
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/libs/qmldebug/qmldebugconnection.cpp
View File

@@ -35,6 +35,8 @@
#include <QTcpServer> #include <QTcpServer>
#include <QTcpSocket> #include <QTcpSocket>
Q_DECLARE_METATYPE(QLocalSocket::LocalSocketError)
namespace QmlDebug { namespace QmlDebug {
const int protocolVersion = 1; const int protocolVersion = 1;
@@ -244,6 +246,11 @@ void QmlDebugConnection::protocolReadyRead()
QmlDebugConnection::QmlDebugConnection(QObject *parent) QmlDebugConnection::QmlDebugConnection(QObject *parent)
: QObject(parent), d_ptr(new QmlDebugConnectionPrivate) : QObject(parent), d_ptr(new QmlDebugConnectionPrivate)
{ {
static const int metaTypes[] = {
qRegisterMetaType<QAbstractSocket::SocketError>(),
qRegisterMetaType<QLocalSocket::LocalSocketError>()
};
Q_UNUSED(metaTypes);
} }
QmlDebugConnection::~QmlDebugConnection() QmlDebugConnection::~QmlDebugConnection()
@@ -343,9 +350,10 @@ void QmlDebugConnection::connectToHost(const QString &hostName, quint16 port)
this, [this](QAbstractSocket::SocketError error) { this, [this](QAbstractSocket::SocketError error) {
emit logError(socketErrorToString(error)); emit logError(socketErrorToString(error));
socketDisconnected(); socketDisconnected();
}); }, Qt::QueuedConnection);
connect(socket, &QAbstractSocket::connected, this, &QmlDebugConnection::socketConnected); connect(socket, &QAbstractSocket::connected, this, &QmlDebugConnection::socketConnected);
connect(socket, &QAbstractSocket::disconnected, this, &QmlDebugConnection::socketDisconnected); connect(socket, &QAbstractSocket::disconnected, this, &QmlDebugConnection::socketDisconnected,
Qt::QueuedConnection);
socket->connectToHost(hostName.isEmpty() ? QString("localhost") : hostName, port); socket->connectToHost(hostName.isEmpty() ? QString("localhost") : hostName, port);
} }
@@ -376,13 +384,14 @@ void QmlDebugConnection::newConnection()
QObject::connect(d->protocol, &QPacketProtocol::readyRead, QObject::connect(d->protocol, &QPacketProtocol::readyRead,
this, &QmlDebugConnection::protocolReadyRead); this, &QmlDebugConnection::protocolReadyRead);
connect(socket, &QLocalSocket::disconnected, this, &QmlDebugConnection::socketDisconnected); connect(socket, &QLocalSocket::disconnected, this, &QmlDebugConnection::socketDisconnected,
Qt::QueuedConnection);
connect(socket, QOverload<QLocalSocket::LocalSocketError>::of(&QLocalSocket::error), connect(socket, QOverload<QLocalSocket::LocalSocketError>::of(&QLocalSocket::error),
this, [this](QLocalSocket::LocalSocketError error) { this, [this](QLocalSocket::LocalSocketError error) {
emit logError(socketErrorToString(static_cast<QAbstractSocket::SocketError>(error))); emit logError(socketErrorToString(static_cast<QAbstractSocket::SocketError>(error)));
socketDisconnected(); socketDisconnected();
}); }, Qt::QueuedConnection);
connect(socket, &QLocalSocket::stateChanged, connect(socket, &QLocalSocket::stateChanged,
this, [this](QLocalSocket::LocalSocketState state) { this, [this](QLocalSocket::LocalSocketState state) {