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

Debugger[CODA/TRK]: Emergency shutdown if gdb crashes.

Browse Source 
Kill the debuggee when gdb crashes in stopped state to prevent
the phone from locking up.

Task-number: QTCREATORBUG-3099
This commit is contained in:
Friedemann Kleint
2010-12-02 15:16:53 +01:00
parent 179d77fa33
commit 52d18e7e6f
4 changed files with 68 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/plugins/debugger/gdb/trkgdbadapter.cpp
View File

@@ -558,10 +558,7 @@ void TrkGdbAdapter::handleGdbServerCommand(const QByteArray &cmd)
}
else if (cmd == "k" || cmd.startsWith("vKill")) {
// Kill inferior process
logMessage(msgGdbPacket(QLatin1String("kill")));
sendTrkMessage(0x41, TrkCB(handleDeleteProcess),
trkDeleteProcessMessage(), "Delete process");
trkKill();
}
else if (cmd.startsWith('m')) {
@@ -864,6 +861,14 @@ void TrkGdbAdapter::gdbSetCurrentThread(const QByteArray &cmd, const char *why)
sendGdbServerMessage("OK", message);
}
void TrkGdbAdapter::trkKill()
{
// Kill inferior process
logMessage(msgGdbPacket(QLatin1String("kill")));
sendTrkMessage(0x41, TrkCB(handleDeleteProcess),
trkDeleteProcessMessage(), "Delete process");
}
void TrkGdbAdapter::trkContinueAll(const char *why)
{
if (why)
@@ -1148,9 +1153,19 @@ void TrkGdbAdapter::handleDeleteProcess(const TrkResult &result)
void TrkGdbAdapter::handleDeleteProcess2(const TrkResult &result)
{
Q_UNUSED(result);
logMessage("App TRK disconnected");
sendGdbServerAck();
sendGdbServerMessage("", "process killed");
QString msg = QString::fromLatin1("App TRK disconnected");
const bool emergencyShutdown = m_gdbProc.state() != QProcess::Running;
if (emergencyShutdown)
msg += QString::fromLatin1(" (emergency shutdown");
logMessage(msg);
if (emergencyShutdown) {
cleanup();
m_engine->notifyAdapterShutdownOk();
} else {
sendGdbServerAck();
sendGdbServerMessage("", "process killed");
}
}
void TrkGdbAdapter::handleReadRegisters(const TrkResult &result)
@@ -1945,8 +1960,16 @@ void TrkGdbAdapter::shutdownInferior()
void TrkGdbAdapter::shutdownAdapter()
{
cleanup();
m_engine->notifyAdapterShutdownOk();
if (m_gdbProc.state() == QProcess::Running) {
cleanup();
m_engine->notifyAdapterShutdownOk();
} else {
// Something is wrong, gdb crashed. Kill debuggee (see handleDeleteProcess2)
if (m_trkDevice->isOpen()) {
logMessage("Emergency shutdown of TRK", LogError);
trkKill();
}
}
}
void TrkGdbAdapter::trkReloadRegisters()