diff options
| author | hjk <hjk@theqtcompany.com> | 2015-06-16 15:01:46 +0200 |
|---|---|---|
| committer | hjk <hjk@theqtcompany.com> | 2015-06-17 06:26:24 +0000 |
| commit | ad6451bbe430ae1776744bd50d8c74cc00b470f4 (patch) | |
| tree | de9df2a4e79b61e15e67e8fc1cdcd0d848482532 /src/plugins/debugger/debuggerengine.cpp | |
| parent | 13daaaac675b3db91103536d24490056bbcd6741 (diff) | |
| download | qt-creator-ad6451bbe430ae1776744bd50d8c74cc00b470f4.tar.gz | |
Debugger: Remove the InferiorExited state
There are now several possible orders of events between sending a 'kill'
and receiving something that indicated a properly shut down inferior.
Coordinating the InferiorExited state during engine ramp down is not
worthwhile as that state had only a forced transition to InferiorShutdownOk
anyway. For the user (and user code), only the fact that ramp down is
finished is interesting.
Change-Id: Ic22131d5a1066dc62bd069f532c28b773f231088
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Diffstat (limited to 'src/plugins/debugger/debuggerengine.cpp')
| -rw-r--r-- | src/plugins/debugger/debuggerengine.cpp | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/src/plugins/debugger/debuggerengine.cpp b/src/plugins/debugger/debuggerengine.cpp index 9b75b834ac..f3fd3bfa84 100644 --- a/src/plugins/debugger/debuggerengine.cpp +++ b/src/plugins/debugger/debuggerengine.cpp @@ -382,7 +382,6 @@ const char *DebuggerEngine::stateName(int s) SN(InferiorStopRequested) SN(InferiorStopOk) SN(InferiorStopFailed) - SN(InferiorExitOk) SN(InferiorShutdownRequested) SN(InferiorShutdownOk) SN(InferiorShutdownFailed) @@ -720,20 +719,17 @@ static bool isAllowedTransition(DebuggerState from, DebuggerState to) return to == InferiorStopOk; case InferiorRunOk: return to == InferiorStopRequested - || to == InferiorStopOk // A spontaneous stop. - || to == InferiorExitOk; + || to == InferiorStopOk // A spontaneous stop. + || to == InferiorShutdownOk; // A spontaneous exit. case InferiorStopRequested: return to == InferiorStopOk || to == InferiorStopFailed; case InferiorStopOk: return to == InferiorRunRequested || to == InferiorShutdownRequested - || to == InferiorStopOk || to == InferiorExitOk; + || to == InferiorStopOk || to == InferiorShutdownOk; case InferiorStopFailed: return to == EngineShutdownRequested; - case InferiorExitOk: - return to == InferiorShutdownOk; - case InferiorUnrunnable: return to == InferiorShutdownRequested; case InferiorShutdownRequested: @@ -1201,7 +1197,6 @@ void DebuggerEngine::notifyInferiorExited() #endif showMessage(_("NOTE: INFERIOR EXITED")); d->resetLocation(); - setState(InferiorExitOk); setState(InferiorShutdownOk); if (isMasterEngine()) d->queueShutdownEngine(); @@ -1364,7 +1359,6 @@ bool DebuggerEngine::debuggerActionsEnabled(DebuggerState state) case EngineRunFailed: case InferiorSetupFailed: case InferiorStopFailed: - case InferiorExitOk: case InferiorShutdownRequested: case InferiorShutdownOk: case InferiorShutdownFailed: @@ -1428,7 +1422,6 @@ void DebuggerEngine::quitDebugger() break; case EngineRunFailed: case DebuggerFinished: - case InferiorExitOk: case InferiorShutdownOk: break; case InferiorSetupRequested: |