From 14c3f5ba511c4a3a292c90a4c45b6d209b0bde58 Mon Sep 17 00:00:00 2001 From: hjk Date: Fri, 18 Dec 2020 18:20:32 +0100 Subject: [PATCH] Debugger: Drop the EngineSetupOk state Directly proceed to EngineRunRequested. Change-Id: I8419086f554bae298624cab3b33e852e92ea54bd Reviewed-by: David Schulz --- src/plugins/debugger/debuggerengine.cpp | 13 +++---------- src/plugins/debugger/debuggerengine.h | 1 - src/plugins/debugger/debuggerplugin.cpp | 24 +++++++++--------------- 3 files changed, 12 insertions(+), 26 deletions(-) diff --git a/src/plugins/debugger/debuggerengine.cpp b/src/plugins/debugger/debuggerengine.cpp index 0cae9c52bb6..783258cb379 100644 --- a/src/plugins/debugger/debuggerengine.cpp +++ b/src/plugins/debugger/debuggerengine.cpp @@ -146,7 +146,6 @@ static bool debuggerActionsEnabledHelper(DebuggerState state) case InferiorRunFailed: case DebuggerNotReady: case EngineSetupRequested: - case EngineSetupOk: case EngineSetupFailed: case EngineRunRequested: case EngineRunFailed: @@ -900,7 +899,6 @@ QString DebuggerEngine::stateName(int s) switch (s) { SN(DebuggerNotReady) SN(EngineSetupRequested) - SN(EngineSetupOk) SN(EngineSetupFailed) SN(EngineRunFailed) SN(EngineRunRequested) @@ -1176,13 +1174,13 @@ static bool isAllowedTransition(DebuggerState from, DebuggerState to) return to == EngineSetupRequested; case EngineSetupRequested: - return to == EngineSetupOk || to == EngineSetupFailed; + return to == EngineRunRequested + || to == EngineSetupFailed + || to == EngineShutdownRequested; case EngineSetupFailed: // In is the engine's task to go into a proper "Shutdown" // state before calling notifyEngineSetupFailed return to == DebuggerFinished; - case EngineSetupOk: - return to == EngineRunRequested || to == EngineShutdownRequested; case EngineRunRequested: return to == EngineRunFailed @@ -1251,9 +1249,7 @@ void DebuggerEngine::notifyEngineSetupOk() // CALLGRIND_START_INSTRUMENTATION; //#endif showMessage("NOTE: ENGINE SETUP OK"); - d->m_progress.setProgressValue(250); QTC_ASSERT(state() == EngineSetupRequested, qDebug() << this << state()); - setState(EngineSetupOk); setState(EngineRunRequested); showMessage("CALL: RUN ENGINE"); d->m_progress.setProgressValue(300); @@ -1990,9 +1986,6 @@ void DebuggerEngine::quitDebugger() case EngineSetupRequested: notifyEngineSetupFailed(); break; - case EngineSetupOk: - notifyEngineSetupFailed(); - break; case EngineRunRequested: notifyEngineRunFailed(); break; diff --git a/src/plugins/debugger/debuggerengine.h b/src/plugins/debugger/debuggerengine.h index fbec99a50a3..1502fe8d569 100644 --- a/src/plugins/debugger/debuggerengine.h +++ b/src/plugins/debugger/debuggerengine.h @@ -62,7 +62,6 @@ enum DebuggerState EngineSetupRequested, // Engine starts EngineSetupFailed, - EngineSetupOk, EngineRunRequested, EngineRunFailed, diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp index ac7552b842c..40edd81a40b 100644 --- a/src/plugins/debugger/debuggerplugin.cpp +++ b/src/plugins/debugger/debuggerplugin.cpp @@ -221,21 +221,15 @@ {notify- {notify- Engine- Engine- SetupOk} SetupFailed} - + + - + `+-+-+> EngineSetupFailed - + + - + [calls RunControl->startFailed] - + + - + DebuggerFinished - v - EngineSetupOk - + - [calls RunControl->StartSuccessful] - + - + - EngineRunRequested - + - (calls *Engine->runEngine()) + + | + + EngineRunRequested <+-+' | `+-+-+> EngineSetupFailed + | + + | [calls RunControl->startFailed] + | + + | DebuggerFinished + | + ------------------------ + / | | \ / | | \ / | | \ | (core) | (attach) | |