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

Maemo: Fix debugger race condition.

Browse Source 
"gdbserver started" does not necessarily mean "gdbserver has opened its port".

Reviewed-by: Tobias Hunger
This commit is contained in:
Christian Kandeler
2010-10-21 11:35:18 +02:00
parent 6b47a0f277
commit a4501441cb
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/qt4projectmanager/qt-maemo/maemodebugsupport.cpp
View File

@@ -230,12 +230,11 @@ void MaemoDebugSupport::startDebugging()
if (useGdb()) { if (useGdb()) {
handleAdapterSetupDone(); handleAdapterSetupDone();
} else { } else {
m_gdbserverOutput.clear();
connect(m_runner, SIGNAL(remoteErrorOutput(QByteArray)), this, connect(m_runner, SIGNAL(remoteErrorOutput(QByteArray)), this,
SLOT(handleRemoteErrorOutput(QByteArray))); SLOT(handleRemoteErrorOutput(QByteArray)));
connect(m_runner, SIGNAL(remoteOutput(QByteArray)), this, connect(m_runner, SIGNAL(remoteOutput(QByteArray)), this,
SLOT(handleRemoteOutput(QByteArray))); SLOT(handleRemoteOutput(QByteArray)));
connect(m_runner, SIGNAL(remoteProcessStarted()), this,
SLOT(handleRemoteProcessStarted()));
const QString &remoteExe = m_runConfig->remoteExecutableFilePath(); const QString &remoteExe = m_runConfig->remoteExecutableFilePath();
const QString cmdPrefix = MaemoGlobal::remoteCommandPrefix(remoteExe); const QString cmdPrefix = MaemoGlobal::remoteCommandPrefix(remoteExe);
const QString env = environment(m_runConfig); const QString env = environment(m_runConfig);
@@ -250,11 +249,6 @@ void MaemoDebugSupport::startDebugging()
} }
} }
void MaemoDebugSupport::handleRemoteProcessStarted()
{
handleAdapterSetupDone();
}
void MaemoDebugSupport::handleDebuggingFinished() void MaemoDebugSupport::handleDebuggingFinished()
{ {
m_stopped = true; m_stopped = true;
@@ -269,6 +263,13 @@ void MaemoDebugSupport::handleRemoteOutput(const QByteArray &output)
void MaemoDebugSupport::handleRemoteErrorOutput(const QByteArray &output) void MaemoDebugSupport::handleRemoteErrorOutput(const QByteArray &output)
{ {
m_runControl->showMessage(QString::fromUtf8(output), AppOutput); m_runControl->showMessage(QString::fromUtf8(output), AppOutput);
if (!m_adapterStarted && !useGdb() && !m_qmlOnlyDebugging) {
m_gdbserverOutput += output;
if (m_gdbserverOutput.contains("Listening on port")) {
handleAdapterSetupDone();
m_gdbserverOutput.clear();
}
}
} }
void MaemoDebugSupport::handleProgressReport(const QString &progressOutput) void MaemoDebugSupport::handleProgressReport(const QString &progressOutput)

2
src/plugins/qt4projectmanager/qt-maemo/maemodebugsupport.h
View File

@@ -75,7 +75,6 @@ private slots:
void handleSftpChannelInitialized(); void handleSftpChannelInitialized();
void handleSftpChannelInitializationFailed(const QString &error); void handleSftpChannelInitializationFailed(const QString &error);
void handleSftpJobFinished(Core::SftpJobId job, const QString &error); void handleSftpJobFinished(Core::SftpJobId job, const QString &error);
void handleRemoteProcessStarted();
void handleDebuggingFinished(); void handleDebuggingFinished();
void handleRemoteOutput(const QByteArray &output); void handleRemoteOutput(const QByteArray &output);
void handleRemoteErrorOutput(const QByteArray &output); void handleRemoteErrorOutput(const QByteArray &output);
@@ -102,6 +101,7 @@ private:
Core::SftpJobId m_uploadJob; Core::SftpJobId m_uploadJob;
bool m_adapterStarted; bool m_adapterStarted;
bool m_stopped; bool m_stopped;
QByteArray m_gdbserverOutput;
}; };
} // namespace Internal } // namespace Internal