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

QmlDebug: Allow retrieval of blocked engines from EngineControl

Browse Source 
Also, don't accidentally add engines to the list on engineAdded() and
engineRemoved().

Change-Id: Ida4362eb003b85282dad17afbf0116c82f024288
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Ulf Hermann
2018-02-08 15:18:02 +01:00
parent 0629400288
commit 43a8bd046e
2 changed files with 24 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/libs/qmldebug/qmlenginecontrolclient.cpp
View File

@@ -65,6 +65,11 @@ void QmlEngineControlClient::releaseEngine(int engineId)
}
}
QList<int> QmlEngineControlClient::blockedEngines() const
{
return m_blockedEngines.keys();
}
void QmlEngineControlClient::messageReceived(const QByteArray &data)
{
QPacket stream(dataStreamVersion(), data);
@@ -77,30 +82,36 @@ void QmlEngineControlClient::messageReceived(const QByteArray &data)
if (!stream.atEnd())
stream >> name;
EngineState &state = m_blockedEngines[id];
QTC_ASSERT(state.blockers == 0 && state.releaseCommand == InvalidCommand, /**/);
auto handleWaiting = [&](CommandType command, std::function<void()> emitter) {
EngineState &state = m_blockedEngines[id];
QTC_CHECK(state.blockers == 0);
QTC_CHECK(state.releaseCommand == InvalidCommand);
state.releaseCommand = command;
emitter();
if (state.blockers == 0) {
sendCommand(state.releaseCommand, id);
m_blockedEngines.remove(id);
}
};
switch (message) {
case EngineAboutToBeAdded:
state.releaseCommand = StartWaitingEngine;
emit engineAboutToBeAdded(id, name);
handleWaiting(StartWaitingEngine, [&](){
emit engineAboutToBeAdded(id, name);
});
break;
case EngineAdded:
emit engineAdded(id, name);
break;
case EngineAboutToBeRemoved:
state.releaseCommand = StopWaitingEngine;
emit engineAboutToBeRemoved(id, name);
handleWaiting(StopWaitingEngine, [&](){
emit engineAboutToBeRemoved(id, name);
});
break;
case EngineRemoved:
emit engineRemoved(id, name);
break;
}
if (state.blockers == 0 && state.releaseCommand != InvalidCommand) {
sendCommand(state.releaseCommand, id);
m_blockedEngines.remove(id);
}
}
void QmlEngineControlClient::sendCommand(QmlEngineControlClient::CommandType command, int engineId)

2
src/libs/qmldebug/qmlenginecontrolclient.h
View File

@@ -52,6 +52,8 @@ public:
void blockEngine(int engineId);
void releaseEngine(int engineId);
QList<int> blockedEngines() const;
void messageReceived(const QByteArray &) override;
signals: