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

Debugger: Combine the EngineShutdown{Ok,Failed} states

Browse Source 
... into a EngineShutdownFinished. They were never handled differently,
and the only option is to proceed to DebuggerFinished anyway. So
simplify the state machine a bit.

Change-Id: Ied3be86fff6750abca578dc6788e4be1d895692b
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
hjk
2017-12-14 09:11:16 +01:00
parent 01fb309c34
commit 585b2c62d5
10 changed files with 33 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -111,8 +111,7 @@ static bool stateAcceptsGdbCommands(DebuggerState state)
case InferiorStopFailed:
case EngineRunFailed:
case InferiorRunFailed:
case EngineShutdownOk:
case EngineShutdownFailed:
case EngineShutdownFinished:
case DebuggerFinished:
return false;
}
@@ -919,7 +918,7 @@ void GdbEngine::commandTimeout()
showMessage("KILLING DEBUGGER AS REQUESTED BY USER");
// This is an undefined state, so we just pull the emergency brake.
m_gdbProc.kill();
notifyEngineShutdownFailed();
notifyEngineShutdownFinished();
} else {
showMessage("CONTINUE DEBUGGER AS REQUESTED BY USER");
}
@@ -1769,7 +1768,7 @@ void GdbEngine::handleGdbExit(const DebuggerResponse &response)
qDebug() << QString("GDB WON'T EXIT (%1); KILLING IT").arg(msg);
showMessage(QString("GDB WON'T EXIT (%1); KILLING IT").arg(msg));
m_gdbProc.kill();
notifyEngineShutdownFailed();
notifyEngineShutdownFinished();
}
}
@@ -4575,12 +4574,12 @@ void GdbEngine::shutdownEngine()
}
case QProcess::NotRunning:
// Cannot find executable.
notifyEngineShutdownOk();
notifyEngineShutdownFinished();
break;
case QProcess::Starting:
showMessage("GDB NOT REALLY RUNNING; KILLING IT");
m_gdbProc.kill();
notifyEngineShutdownFailed();
notifyEngineShutdownFinished();
break;
}
}