feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

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

Browse Source 
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 <christian.stenger@qt.io>
This commit is contained in:
hjk
2017-10-16 09:51:11 +02:00
parent 6221746466
commit 4977c91544
3 changed files with 7 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/plugins/debugger/debuggerengine.cpp
View File

@@ -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()
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()

1
src/plugins/debugger/debuggerengine.h
View File

@@ -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();

4
src/plugins/debugger/qml/qmlcppengine.cpp
View File

@@ -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()