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

Debugger: Catch 'Remote connection closed' in response

Browse Source 
'Remote connection closed' messages sometimes also arrive camuflaged
as a response to a command (with the response of the original
command already there).

Change-Id: I8fa75f561fb341463fc4c0ed0a35aa6fd8300694
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
Kai Koehne
2012-05-07 14:29:22 +02:00
committed by hjk
parent 5317ed796b
commit 9d86ad7990
1 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/plugins/debugger/gdb/gdbengine.cpp
View File

@@ -386,6 +386,26 @@ static bool isNameChar(char c)
return (c >= 'a' && c <= 'z') || c == '-';
}
static bool isGdbConnectionError(const QByteArray &message)
{
//
// Handle messages gdb client produces when the target exits (gdbserver)
//
// we get this as response either to a specific command, e.g.
// 31^error,msg="Remote connection closed"
// or as informative output:
// &Remote connection closed
//
const QByteArray trimmed = message.trimmed();
if (trimmed == "Remote connection closed"
|| trimmed == "Remote communication error. "
"Target disconnected.: No error."
|| trimmed == "Quit") {
return true;
}
return false;
}
void GdbEngine::handleResponse(const QByteArray &buff)
{
showMessage(QString::fromLocal8Bit(buff, buff.length()), LogOutput);
@@ -668,12 +688,9 @@ void GdbEngine::handleResponse(const QByteArray &buff)
if (data.startsWith("warning:"))
showMessage(_(data.mid(9)), AppStuff); // Cut "warning: "
// Messages when the target exits (gdbserver)
if (data.trimmed() == "Remote connection closed"
|| data.trimmed() == "Remote communication error. "
"Target disconnected.: No error."
|| data.trimmed() == "Quit") {
if (isGdbConnectionError(data)) {
notifyInferiorExited();
break;
}
// From SuSE's gdb: >&"Missing separate debuginfo for ...\n"
@@ -1113,6 +1130,8 @@ void GdbEngine::handleResultRecord(GdbResponse *response)
QTC_CHECK(state() == InferiorRunOk);
notifyInferiorSpontaneousStop();
notifyEngineIll();
} else if (isGdbConnectionError(msg)) {
notifyInferiorExited();
} else {
// Windows: Some DLL or some function not found. Report
// the exception now in a box.