diff options
| author | hjk <[email protected]> | 2017-11-15 17:12:03 +0100 |
|---|---|---|
| committer | hjk <[email protected]> | 2017-12-06 13:30:04 +0000 |
| commit | 8f1a161c649d26cd256323d92a20270310738932 (patch) | |
| tree | 8fef5b05acc17e30e3b7c1cf9352b47fbd359e73 /src/plugins/debugger/debuggerplugin.cpp | |
| parent | 2427f1267f8dc65f2cd442b52fb5554f2cb83a0e (diff) | |
Debugger: Merge EngineSetup and InferiorSetup start phases
It was needed in the past to trigger e.g. gdbserver setup in
remote cases which is nowadays handled by separate RunWorkers.
Change-Id: I30bce071dab0779cce2e7abef7b31550d8539461
Reviewed-by: Christian Stenger <[email protected]>
Reviewed-by: David Schulz <[email protected]>
Diffstat (limited to 'src/plugins/debugger/debuggerplugin.cpp')
| -rw-r--r-- | src/plugins/debugger/debuggerplugin.cpp | 53 |
1 files changed, 18 insertions, 35 deletions
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp index 0a52fba2a65..d0e633c8fdb 100644 --- a/src/plugins/debugger/debuggerplugin.cpp +++ b/src/plugins/debugger/debuggerplugin.cpp @@ -234,35 +234,23 @@ EngineSetupOk + [calls RunControl->StartSuccessful] - + - InferiorSetupRequested - + - (calls *Engine->setupInferior()) - | | - | | - {notify- {notify- - Inferior- Inferior- - SetupOk} SetupFailed} - + + - + ` +-+-> InferiorSetupFailed +-+-+-+-+-+->. - + + - InferiorSetupOk + - + + - EngineRunRequested + - + + - (calls *Engine->runEngine()) + - / | | \ + - / | | \ + - | (core) | (attach) | | + - | | | | + - {notify- {notifyER&- {notifyER&- {notify- + - Inferior- Inferior- Inferior- EngineRun- + - Unrunnable} StopOk} RunOk} Failed} + - + + + + + - InferiorUnrunnable + InferiorRunOk + + - + + + - InferiorStopOk EngineRunFailed + - + v + + + + + EngineRunRequested + + + (calls *Engine->runEngine()) + / | | \ + / | | \ + | (core) | (attach) | | + | | | | + {notify- {notifyER&- {notifyER&- {notify- + Inferior- Inferior- Inferior- EngineRun- + Unrunnable} StopOk} RunOk} Failed} + + + + + + InferiorUnrunnable + InferiorRunOk + + + + + InferiorStopOk EngineRunFailed + + `-+-+-+-+-+-+-+-+-+-+-+>-+ + + @@ -327,11 +315,7 @@ sg1: DebuggerNotReady -> EngineSetupRequested sg1: EngineSetupRequested -> EngineSetupOk [ label="notifyEngineSetupOk", style="dashed" ]; sg1: EngineSetupRequested -> EngineSetupFailed [ label= "notifyEngineSetupFailed", style="dashed"]; sg1: EngineSetupFailed -> DebuggerFinished [ label= "RunControl::StartFailed" ]; -sg1: EngineSetupOk -> InferiorSetupRequested [ label= "RunControl::StartSuccessful" ]; -sg1: InferiorSetupRequested -> InferiorSetupOk [ label="notifyInferiorSetupOk", style="dashed" ]; -sg1: InferiorSetupRequested -> InferiorSetupFailed [ label="notifyInferiorFailed", style="dashed" ]; -sg1: InferiorSetupOk -> EngineRunRequested -sg1: InferiorSetupFailed -> EngineShutdownRequested +sg1: EngineSetupOk -> EngineRunRequested [ label= "RunControl::StartSuccessful" ]; sg1: EngineRunRequested -> InferiorUnrunnable [ label="notifyInferiorUnrunnable", style="dashed" ]; sg1: EngineRunRequested -> InferiorStopOk [ label="notifyEngineRunAndInferiorStopOk", style="dashed" ]; sg1: EngineRunRequested -> InferiorRunOk [ label="notifyEngineRunAndInferiorRunOk", style="dashed" ]; @@ -495,7 +479,6 @@ public: ~DummyEngine() override {} void setupEngine() override {} - void setupInferior() override {} void runEngine() override {} void shutdownEngine() override {} void shutdownInferior() override {} |