From 7aaab4d050781b3a3b7e0faa7d274deffb76ed82 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Thu, 28 Jul 2011 10:38:39 +0200 Subject: [PATCH] QmlDbg: Don't wait infinitely for messages on application output We only connect to the port when we get a 'Waiting for connection ...' message on application output. This was done mainly to avoid lots of failed connects, and therefore an unresponsive UI on Windows. However, the application output might be redirected for various reasons. Therefore fall back to busy connect after a certain time (4 seconds for profiling, 8 seconds for debugging). Change-Id: Ie1b943f678ced40c030cc134493a2adf7e3bc9df Reviewed-on: http://codereview.qt.nokia.com/2323 Reviewed-by: Qt Sanity Bot Reviewed-by: Christiaan Janssen --- src/plugins/debugger/qml/qmlengine.cpp | 23 ++++++++++++++++--- src/plugins/debugger/qml/qmlengine.h | 1 + src/plugins/qmlprofiler/qmlprofilerengine.cpp | 22 ++++++++++++++++-- src/plugins/qmlprofiler/qmlprofilerengine.h | 1 + 4 files changed, 42 insertions(+), 5 deletions(-) diff --git a/src/plugins/debugger/qml/qmlengine.cpp b/src/plugins/debugger/qml/qmlengine.cpp index 20daa247166..11d29e5447c 100644 --- a/src/plugins/debugger/qml/qmlengine.cpp +++ b/src/plugins/debugger/qml/qmlengine.cpp @@ -164,6 +164,7 @@ private: QmlAdapter m_adapter; ApplicationLauncher m_applicationLauncher; Utils::FileInProjectFinder fileFinder; + QTimer m_noDebugOutputTimer; }; QmlEnginePrivate::QmlEnginePrivate(QmlEngine *q) @@ -203,6 +204,12 @@ QmlEngine::QmlEngine(const DebuggerStartParameters &startParameters, connect(&d->m_applicationLauncher, SIGNAL(appendMessage(QString,Utils::OutputFormat)), SLOT(appendMessage(QString,Utils::OutputFormat))); + +// Only wait 8 seconds for the 'Waiting for connection' on application ouput, then just try to connect + // (application output might be redirected / blocked) + d->m_noDebugOutputTimer.setSingleShot(true); + d->m_noDebugOutputTimer.setInterval(8000); + connect(&d->m_noDebugOutputTimer, SIGNAL(timeout()), this, SLOT(beginConnection())); } QmlEngine::~QmlEngine() @@ -251,6 +258,12 @@ void QmlEngine::connectionEstablished() notifyEngineRunAndInferiorRunOk(); } +void QmlEngine::beginConnection() +{ + d->m_noDebugOutputTimer.stop(); + d->m_adapter.beginConnection(); +} + void QmlEngine::connectionStartupFailed() { Core::ICore * const core = Core::ICore::instance(); @@ -273,7 +286,7 @@ void QmlEngine::retryMessageBoxFinished(int result) { switch (result) { case QMessageBox::Retry: { - d->m_adapter.beginConnection(); + beginConnection(); break; } case QMessageBox::Help: { @@ -311,6 +324,9 @@ void QmlEngine::filterApplicationMessage(const QString &msg, int /*channel*/) const int index = msg.indexOf(qddserver); if (index != -1) { + // we're actually getting debug output + d->m_noDebugOutputTimer.stop(); + QString status = msg; status.remove(0, index + qddserver.length()); // chop of 'QDeclarativeDebugServer: ' @@ -322,7 +338,7 @@ void QmlEngine::filterApplicationMessage(const QString &msg, int /*channel*/) QString errorMessage; if (status.startsWith(waitingForConnection)) { - d->m_adapter.beginConnection(); + beginConnection(); } else if (status.startsWith(unableToListen)) { //: Error message shown after 'Could not connect ... debugger:" errorMessage = tr("The port seems to be in use."); @@ -356,7 +372,7 @@ void QmlEngine::filterApplicationMessage(const QString &msg, int /*channel*/) } } else if (msg.contains(cannotRetrieveDebuggingOutput)) { // we won't get debugging output, so just try to connect ... - d->m_adapter.beginConnection(); + beginConnection(); } } @@ -385,6 +401,7 @@ void QmlEngine::runEngine() if (!isSlaveEngine() && startParameters().startMode != AttachToRemote) startApplicationLauncher(); + d->m_noDebugOutputTimer.start(); } void QmlEngine::startApplicationLauncher() diff --git a/src/plugins/debugger/qml/qmlengine.h b/src/plugins/debugger/qml/qmlengine.h index 9dd2b82e219..6328823216e 100644 --- a/src/plugins/debugger/qml/qmlengine.h +++ b/src/plugins/debugger/qml/qmlengine.h @@ -126,6 +126,7 @@ signals: TextEditor::ITextEditor *editor, int cursorPos); private slots: + void beginConnection(); void connectionEstablished(); void connectionStartupFailed(); void connectionError(QAbstractSocket::SocketError error); diff --git a/src/plugins/qmlprofiler/qmlprofilerengine.cpp b/src/plugins/qmlprofiler/qmlprofilerengine.cpp index 402f32c70ac..931afd81a29 100644 --- a/src/plugins/qmlprofiler/qmlprofilerengine.cpp +++ b/src/plugins/qmlprofiler/qmlprofilerengine.cpp @@ -54,6 +54,7 @@ #include #include +#include using namespace Analyzer; using namespace ProjectExplorer; @@ -83,6 +84,7 @@ public: bool m_fetchingData; bool m_fetchDataFromStart; bool m_delayedDelete; + QTimer m_noDebugOutputTimer; }; AbstractQmlProfilerRunner * @@ -135,6 +137,12 @@ QmlProfilerEngine::QmlProfilerEngine(IAnalyzerTool *tool, d->m_fetchingData = false; d->m_fetchDataFromStart = false; d->m_delayedDelete = false; + + // Only wait 4 seconds for the 'Waiting for connection' on application ouput, then just try to connect + // (application output might be redirected / blocked) + d->m_noDebugOutputTimer.setSingleShot(true); + d->m_noDebugOutputTimer.setInterval(4000); + connect(&d->m_noDebugOutputTimer, SIGNAL(timeout()), this, SLOT(processIsRunning())); } QmlProfilerEngine::~QmlProfilerEngine() @@ -174,6 +182,7 @@ bool QmlProfilerEngine::start() connect(d->m_runner, SIGNAL(appendMessage(QString,Utils::OutputFormat)), this, SLOT(logApplicationMessage(QString,Utils::OutputFormat))); + d->m_noDebugOutputTimer.start(); d->m_runner->start(); d->m_running = true; @@ -248,6 +257,9 @@ void QmlProfilerEngine::filterApplicationMessage(const QString &msg) const int index = msg.indexOf(qddserver); if (index != -1) { + // we're actually getting debug output + d->m_noDebugOutputTimer.stop(); + QString status = msg; status.remove(0, index + qddserver.length()); // chop of 'QDeclarativeDebugServer: ' @@ -259,7 +271,7 @@ void QmlProfilerEngine::filterApplicationMessage(const QString &msg) QString errorMessage; if (status.startsWith(waitingForConnection)) { - emit processRunning(d->m_runner->debugPort()); + processIsRunning(); } else if (status.startsWith(unableToListen)) { //: Error message shown after 'Could not connect ... debugger:" errorMessage = tr("The port seems to be in use."); @@ -291,7 +303,7 @@ void QmlProfilerEngine::filterApplicationMessage(const QString &msg) } } else if (msg.contains(cannotRetrieveDebuggingOutput)) { // we won't get debugging output, so just try to connect ... - emit processRunning(d->m_runner->debugPort()); + processIsRunning(); } } @@ -323,5 +335,11 @@ void QmlProfilerEngine::showNonmodalWarning(const QString &warningMsg) noExecWarning->show(); } +void QmlProfilerEngine::processIsRunning() +{ + d->m_noDebugOutputTimer.stop(); + emit processRunning(d->m_runner->debugPort()); +} + } // namespace Internal } // namespace QmlProfiler diff --git a/src/plugins/qmlprofiler/qmlprofilerengine.h b/src/plugins/qmlprofiler/qmlprofilerengine.h index 9b215be1370..359ba8ebe86 100644 --- a/src/plugins/qmlprofiler/qmlprofilerengine.h +++ b/src/plugins/qmlprofiler/qmlprofilerengine.h @@ -66,6 +66,7 @@ private slots: void logApplicationMessage(const QString &msg, Utils::OutputFormat format); void filterApplicationMessage(const QString &msg); void wrongSetupMessageBoxFinished(int); + void processIsRunning(); private: class QmlProfilerEnginePrivate;