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

Maemo: When debugging, print gdbserver and application output.

Browse Source 
Reviewed-by: kh1
This commit is contained in:
ck
2010-04-16 14:36:55 +02:00
parent 9faa4b5a59
commit 8dd627a257
2 changed files with 7 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/plugins/qt4projectmanager/qt-maemo/maemoruncontrol.cpp
View File

@@ -406,7 +406,7 @@ MaemoDebugRunControl::~MaemoDebugRunControl()
void MaemoDebugRunControl::startInternal() void MaemoDebugRunControl::startInternal()
{ {
m_inferiorPid = -1; m_debuggingStarted = false;
startDeployment(true); startDeployment(true);
} }
@@ -419,27 +419,11 @@ QString MaemoDebugRunControl::remoteCall() const
void MaemoDebugRunControl::handleRemoteOutput(const QString &output) void MaemoDebugRunControl::handleRemoteOutput(const QString &output)
{ {
qDebug("gdbserver's stderr output: %s", output.toLatin1().data()); if (!m_debuggingStarted) {
if (m_inferiorPid != -1) m_debuggingStarted = true;
return;
const QString searchString("pid = ");
const int searchStringLength = searchString.length();
int pidStartPos = output.indexOf(searchString);
const int pidEndPos = output.indexOf("\n", pidStartPos + searchStringLength);
if (pidStartPos == -1 || pidEndPos == -1)
return; // gdbserver has not started yet.
pidStartPos += searchStringLength;
QString pidString = output.mid(pidStartPos, pidEndPos - pidStartPos);
qDebug("pidString = %s", pidString.toLatin1().data());
bool ok;
const int pid = pidString.toInt(&ok);
if (!ok) {
handleError(tr("Debugging failed: Could not parse gdbserver output."));
m_debuggerManager->exitDebugger();
} else {
m_inferiorPid = pid;
startDebugging(); startDebugging();
} }
emit addToOutputWindowInline(this, output);
} }
void MaemoDebugRunControl::startDebugging() void MaemoDebugRunControl::startDebugging()
@@ -465,7 +449,7 @@ void MaemoDebugRunControl::debuggingFinished()
void MaemoDebugRunControl::debuggerOutput(const QString &output) void MaemoDebugRunControl::debuggerOutput(const QString &output)
{ {
emit addToOutputWindowInline(this, output); emit addToOutputWindowInline(this, QLatin1String("[gdb says:] ") + output);
} }
QString MaemoDebugRunControl::gdbServerPort() const QString MaemoDebugRunControl::gdbServerPort() const

3
src/plugins/qt4projectmanager/qt-maemo/maemoruncontrol.h
View File

@@ -165,7 +165,8 @@ private:
Debugger::DebuggerManager *m_debuggerManager; Debugger::DebuggerManager *m_debuggerManager;
QSharedPointer<Debugger::DebuggerStartParameters> m_startParams; QSharedPointer<Debugger::DebuggerStartParameters> m_startParams;
int m_inferiorPid;
bool m_debuggingStarted;
}; };
} // namespace Internal } // namespace Internal