aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/debugger/debuggerplugin.cpp
diff options
context:
space:
mode:
authorhjk <[email protected]>2017-12-14 09:36:41 +0100
committerhjk <[email protected]>2017-12-14 11:26:52 +0000
commit83c13ff1919a9a123648985009ba9ff4a4c0c52d (patch)
treee6835144575f7122bb8564d1df1c09e3e89ed8b7 /src/plugins/debugger/debuggerplugin.cpp
parentee9ecf86614a78423c6d14893070f6ac221446be (diff)
Debugger: Combine the InferiorShutdown{Ok,Failed} states
... into a InferiorShutdownFinished. Change-Id: Icb5394f38f52f7cf300dc83f4eb8f2f0777bbcba Reviewed-by: David Schulz <[email protected]>
Diffstat (limited to 'src/plugins/debugger/debuggerplugin.cpp')
-rw-r--r--src/plugins/debugger/debuggerplugin.cpp34
1 files changed, 15 insertions, 19 deletions
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index 16bda301f0a..d55d04bfde1 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -276,21 +276,19 @@
InferiorShutdownRequested +
+ +
(calls *Engine->shutdownInferior()) +
- | | +
- {notify- {notify- +
- Inferior- Inferior- +
- ShutdownOk} ShutdownFailed} +
- + + +
- + + +
- #Inferior exited# + + +
- | + + +
- {notifyInferior- + + +
- Exited} + + +
- + + + +
- + + + +
- + + + +
- InferiorShutdownOk InferiorShutdownFailed +
- * * +
+ | +
+ {notifyInferiorShutdownFinished} +
+ + +
+ + +
+ #Inferior exited# + +
+ | + +
+ {notifyInferior- + +
+ Exited} + +
+ + + +
+ + + +
+ + + +
+ InferiorShutdownFinished +
+ * +
EngineShutdownRequested +
+ +
(calls *Engine->shutdownEngine()) <+-+-+-+-+-+-+-+-+-+-+-+-+-+'
@@ -329,12 +327,10 @@ sg1: InferiorRunRequested -> InferiorRunFailed [ label="notifyInferiorRunFaile
sg1: InferiorRunFailed -> InferiorStopOk
sg1: InferiorStopOk -> InferiorShutdownRequested [ label="Close event" ];
sg1: InferiorUnrunnable -> InferiorShutdownRequested [ label="Close event" ];
-sg1: InferiorShutdownRequested -> InferiorShutdownOk [ label= "Engine::shutdownInferior\nnotifyInferiorShutdownOk", style="dashed" ];
-sg1: InferiorShutdownRequested -> InferiorShutdownFailed [ label="Engine::shutdownInferior\nnotifyInferiorShutdownFailed", style="dashed" ];
+sg1: InferiorShutdownRequested -> InferiorShutdownFinished [ label= "Engine::shutdownInferior\nnotifyInferiorShutdownFinished", style="dashed" ];
sg1: InferiorExited -> InferiorExitOk [ label="notifyInferiorExited", style="dashed"];
sg1: InferiorExitOk -> InferiorShutdownOk
-sg1: InferiorShutdownOk -> EngineShutdownRequested
-sg1: InferiorShutdownFailed -> EngineShutdownRequested
+sg1: InferiorShutdownFinished -> EngineShutdownRequested
sg1: EngineShutdownRequested -> EngineShutdownFinished [ label="Engine::shutdownEngine\nnotifyEngineShutdownFinished", style="dashed" ];
sg1: EngineShutdownFinished -> DebuggerFinished [ style = "dotted" ];
sg1: }