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

QmlProfiler: Limit hard resetting of QML debug connection

Browse Source 
On windows it can take a long time to establish the connection. On OSX
we want to throw away the first connection after trying for 200ms. We
don't want to introduce #ifdefs here, so after throwing away two
connections stick to the third one.

Change-Id: I407120244747ac39429786e371c93a7d1e29933d
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
This commit is contained in:
Ulf Hermann
2016-03-01 11:34:19 +01:00
parent dfa8e27968
commit 09c4ae8ed5
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp
View File

@@ -246,14 +246,19 @@ void QmlProfilerClientManager::tryToConnect()
d->connectionAttempts = 0; d->connectionAttempts = 0;
} else if (d->connection && } else if (d->connection &&
d->connection->socketState() != QAbstractSocket::ConnectedState) { d->connection->socketState() != QAbstractSocket::ConnectedState) {
// Replace the connection after trying for some time. On some operating systems (OSX) the if (d->connectionAttempts < 3) {
// very first connection to a TCP server takes a very long time to get established. // Replace the connection after trying for some time. On some operating systems (OSX)
// the very first connection to a TCP server takes a very long time to get established.
// On other operating systems (Windows) any connection can actually take a long time,
// so after clearing the connection twice, leave it around until the 50 attempts are
// done.
// delete directly here, so that any pending events aren't delivered. We don't want the // delete directly here, so that any pending events aren't delivered. We don't want the
// connection first to be established and then torn down again. // connection first to be established and then torn down again.
delete d->connection; delete d->connection;
d->connection = 0; d->connection = 0;
connectClient(d->tcpPort); connectClient(d->tcpPort);
}
connectToClient(); connectToClient();
} else if (d->connectionAttempts == 50) { } else if (d->connectionAttempts == 50) {
d->connectionTimer.stop(); d->connectionTimer.stop();