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

Squish: Separate server handling

Browse Source 
Change-Id: Ibcafe31bc8fd7dfaea165b95ed8898a7bff69d21
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Christian Stenger
2023-01-03 14:28:45 +01:00
parent bef44699a3
commit 3d7baa65f9
2 changed files with 92 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

154
src/plugins/squish/squishtools.cpp
View File

@@ -83,6 +83,11 @@ static void logRunnerStateChange(RunnerState from, RunnerState to)
qCInfo(LOG) << "Runner state change:" << runnerStateName(from) << ">" << runnerStateName(to);
}
static void logToolsStateChange(SquishTools::State from, SquishTools::State to)
{
qCInfo(LOG) << "State change:" << toolsStateName(from) << ">" << toolsStateName(to);
}
class SquishLocationMark : public TextEditor::TextMark
{
public:
@@ -327,19 +332,28 @@ void SquishTools::onServerStateChanged(SquishProcessState state)
{
switch (state) {
case Starting:
setState(SquishTools::ServerStarting);
logToolsStateChange(m_state, SquishTools::ServerStarting);
m_state = SquishTools::ServerStarting;
break;
case Started:
setState(SquishTools::ServerStarted);
logToolsStateChange(m_state, SquishTools::ServerStarted);
m_state = SquishTools::ServerStarted;
onServerStarted();
break;
case StartFailed:
setState(SquishTools::ServerStartFailed);
logToolsStateChange(m_state, SquishTools::ServerStartFailed);
m_state = SquishTools::ServerStartFailed;
onServerStartFailed();
break;
case Stopped:
setState(SquishTools::ServerStopped);
logToolsStateChange(m_state, SquishTools::ServerStopped);
m_state = SquishTools::ServerStopped;
onServerStopped();
break;
case StopFailed:
setState(SquishTools::ServerStopFailed);
logToolsStateChange(m_state, SquishTools::ServerStopFailed);
m_state = SquishTools::ServerStopFailed;
onServerStopFailed();
break;
default:
// Idle currently unhandled / not needed?
@@ -347,6 +361,74 @@ void SquishTools::onServerStateChanged(SquishProcessState state)
}
}
void SquishTools::onServerStarted()
{
if (m_request == RunnerQueryRequested) {
executeRunnerQuery();
} else if (m_request == RunTestRequested || m_request == RecordTestRequested) {
startSquishRunner();
} else if (m_request == ServerConfigChangeRequested) { // nothing to do here
} else {
QTC_ASSERT(false, qDebug() << m_state << m_request);
}
}
void SquishTools::onServerStopped()
{
m_state = Idle;
emit shutdownFinished();
if (m_request == ServerConfigChangeRequested) {
if (m_serverProcess.result() == ProcessResult::FinishedWithError) {
emit configChangesFailed(m_serverProcess.error());
return;
}
m_serverConfigChanges.removeFirst();
if (!m_serverConfigChanges.isEmpty())
startSquishServer(ServerConfigChangeRequested);
else
emit configChangesWritten();
} else if (m_request == ServerStopRequested) {
m_request = None;
if (m_perspective.perspectiveMode() == SquishPerspective::Running)
emit squishTestRunFinished();
m_perspective.setPerspectiveMode(SquishPerspective::NoMode);
if (toolsSettings.minimizeIDE)
restoreQtCreatorWindows();
m_perspective.destroyControlBar();
} else if (m_request == KillOldBeforeQueryRunner) {
startSquishServer(RunnerQueryRequested);
} else if (m_request == KillOldBeforeRunRunner) {
startSquishServer(RunTestRequested);
} else if (m_request == KillOldBeforeRecordRunner) {
startSquishServer(RecordTestRequested);
} else {
QTC_ASSERT(false, qDebug() << m_request);
}
}
void SquishTools::onServerStartFailed()
{
m_state = Idle;
if (m_request == RunTestRequested)
emit squishTestRunFinished();
m_perspective.setPerspectiveMode(SquishPerspective::NoMode);
m_request = None;
if (toolsSettings.minimizeIDE)
restoreQtCreatorWindows();
m_perspective.destroyControlBar();
}
void SquishTools::onServerStopFailed()
{
m_serverProcess.closeProcess();
if (toolsSettings.minimizeIDE)
restoreQtCreatorWindows();
m_perspective.destroyControlBar();
m_state = Idle;
}
void SquishTools::setState(SquishTools::State state)
{
qCInfo(LOG) << "State change:" << toolsStateName(m_state) << ">" << toolsStateName(state);
@@ -357,66 +439,6 @@ void SquishTools::setState(SquishTools::State state)
case Idle:
setIdle();
break;
case ServerStarted:
if (m_request == RunnerQueryRequested) {
executeRunnerQuery();
} else if (m_request == RunTestRequested || m_request == RecordTestRequested) {
startSquishRunner();
} else if (m_request == ServerConfigChangeRequested) { // nothing to do here
} else {
QTC_ASSERT(false, qDebug() << m_state << m_request);
}
break;
case ServerStartFailed:
m_state = Idle;
if (m_request == RunTestRequested)
emit squishTestRunFinished();
m_perspective.setPerspectiveMode(SquishPerspective::NoMode);
m_request = None;
if (toolsSettings.minimizeIDE)
restoreQtCreatorWindows();
m_perspective.destroyControlBar();
break;
case ServerStopped:
m_state = Idle;
emit shutdownFinished();
if (m_request == ServerConfigChangeRequested) {
if (m_serverProcess.result() == ProcessResult::FinishedWithError) {
emit configChangesFailed(m_serverProcess.error());
break;
}
m_serverConfigChanges.removeFirst();
if (!m_serverConfigChanges.isEmpty())
startSquishServer(ServerConfigChangeRequested);
else
emit configChangesWritten();
} else if (m_request == ServerStopRequested) {
m_request = None;
if (m_perspective.perspectiveMode() == SquishPerspective::Running)
emit squishTestRunFinished();
m_perspective.setPerspectiveMode(SquishPerspective::NoMode);
if (toolsSettings.minimizeIDE)
restoreQtCreatorWindows();
m_perspective.destroyControlBar();
} else if (m_request == KillOldBeforeQueryRunner) {
startSquishServer(RunnerQueryRequested);
} else if (m_request == KillOldBeforeRunRunner) {
startSquishServer(RunTestRequested);
} else if (m_request == KillOldBeforeRecordRunner) {
startSquishServer(RecordTestRequested);
} else {
QTC_ASSERT(false, qDebug() << m_state << m_request);
}
break;
case ServerStopFailed:
m_serverProcess.closeProcess();
if (toolsSettings.minimizeIDE)
restoreQtCreatorWindows();
m_perspective.destroyControlBar();
m_state = Idle;
break;
case RunnerStartFailed:
case RunnerStopped:
if (m_request == RunnerQueryRequested) {
@@ -1291,7 +1313,7 @@ bool SquishTools::isValidToStartRunner()
.arg(m_state)
.arg(m_request));
// setting state to ServerStartFailed will terminate/kill the current unusable server
setState(ServerStartFailed);
onServerStateChanged(StartFailed);
return false;
}

4
src/plugins/squish/squishtools.h
View File

@@ -90,6 +90,10 @@ private:
enum RunnerQuery { ServerInfo, GetGlobalScriptDirs, SetGlobalScriptDirs };
void onServerStateChanged(SquishProcessState state);
void onServerStarted();
void onServerStopped();
void onServerStartFailed();
void onServerStopFailed();
void setState(State state);
void setIdle();
void startSquishServer(Request request);