Commit 4977c915 authored by hjk's avatar hjk

Debugger: Directly pass from engine to inferior setup in all engines

This removes the setupSlaveInferior() synchronization point which
wasn't really needed anymore as it was always triggered in
response to a notifyEngineSetupOk() of the master engine.

Change-Id: I24faec36b180fa961e10dfd88fe4d874f7310140
Reviewed-by: Christian Stenger's avatarChristian Stenger <christian.stenger@qt.io>
parent 62217464
...@@ -230,7 +230,6 @@ public: ...@@ -230,7 +230,6 @@ public:
} }
void doSetupEngine(); void doSetupEngine();
void doSetupInferior();
void doRunEngine(); void doRunEngine();
void doShutdownEngine(); void doShutdownEngine();
void doShutdownInferior(); void doShutdownInferior();
...@@ -691,24 +690,13 @@ void DebuggerEngine::notifyEngineSetupOk() ...@@ -691,24 +690,13 @@ void DebuggerEngine::notifyEngineSetupOk()
showMessage("NOTE: ENGINE SETUP OK"); showMessage("NOTE: ENGINE SETUP OK");
QTC_ASSERT(state() == EngineSetupRequested, qDebug() << this << state()); QTC_ASSERT(state() == EngineSetupRequested, qDebug() << this << state());
setState(EngineSetupOk); setState(EngineSetupOk);
if (isMasterEngine() && runTool()) { if (isMasterEngine() && runTool())
runTool()->reportStarted(); runTool()->reportStarted();
d->doSetupInferior();
}
}
void DebuggerEngine::setupSlaveInferior() setState(InferiorSetupRequested);
{ showMessage("CALL: SETUP INFERIOR");
QTC_CHECK(state() == EngineSetupOk); d->m_progress.setProgressValue(250);
d->doSetupInferior(); setupInferior();
}
void DebuggerEnginePrivate::doSetupInferior()
{
m_engine->setState(InferiorSetupRequested);
m_engine->showMessage("CALL: SETUP INFERIOR");
m_progress.setProgressValue(250);
m_engine->setupInferior();
} }
void DebuggerEngine::notifyInferiorSetupFailed() void DebuggerEngine::notifyInferiorSetupFailed()
......
...@@ -470,7 +470,6 @@ protected: ...@@ -470,7 +470,6 @@ protected:
bool isStateDebugging() const; bool isStateDebugging() const;
void setStateDebugging(bool on); void setStateDebugging(bool on);
virtual void setupSlaveInferior();
virtual void setupSlaveEngine(); virtual void setupSlaveEngine();
virtual void runSlaveEngine(); virtual void runSlaveEngine();
virtual void shutdownSlaveEngine(); virtual void shutdownSlaveEngine();
......
...@@ -380,8 +380,8 @@ void QmlCppEngine::setupEngine() ...@@ -380,8 +380,8 @@ void QmlCppEngine::setupEngine()
void QmlCppEngine::setupInferior() void QmlCppEngine::setupInferior()
{ {
EDEBUG("\nMASTER SETUP INFERIOR"); EDEBUG("\nMASTER SETUP INFERIOR");
m_qmlEngine->setupSlaveInferior(); m_qmlEngine->setupInferior();
m_cppEngine->setupSlaveInferior(); m_cppEngine->setupInferior();
} }
void QmlCppEngine::runEngine() void QmlCppEngine::runEngine()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment