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

Docker: Fix process state handling

Browse Source 
Fixes the following errors that would trigger warnings due to incorrect
QtcProcess/ProcessImpl state synchronization

* Don't emit readyRead when state != Running
* Set result.m_error to FailedToStart if remote pid was not received
* Send stderr data once the pid was received
* Don't call deleteLater() on nullptr

Change-Id: I4b498a860ad27bef1a5b3e26417576431b54e84c
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Marcus Tillmanns
2023-03-28 07:52:57 +02:00
parent d8e87413a3
commit c7b6c66cab
1 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/plugins/docker/dockerdevice.cpp
View File

@@ -255,8 +255,10 @@ DockerProcessImpl::DockerProcessImpl(IDevice::ConstPtr device, DockerDevicePriva
if (ok) if (ok)
emit started(m_remotePID); emit started(m_remotePID);
if (rest.size() > 0) // In case we already received some error output, send it now.
emit readyRead(rest, {}); const QByteArray stdErr = m_process.readAllRawStandardError();
if (rest.size() > 0 || stdErr.size() > 0)
emit readyRead(rest, stdErr);
m_hasReceivedFirstOutput = true; m_hasReceivedFirstOutput = true;
return; return;
@@ -266,13 +268,28 @@ DockerProcessImpl::DockerProcessImpl(IDevice::ConstPtr device, DockerDevicePriva
}); });
connect(&m_process, &QtcProcess::readyReadStandardError, this, [this] { connect(&m_process, &QtcProcess::readyReadStandardError, this, [this] {
if (m_remotePID)
emit readyRead({}, m_process.readAllRawStandardError()); emit readyRead({}, m_process.readAllRawStandardError());
}); });
connect(&m_process, &QtcProcess::done, this, [this] { connect(&m_process, &QtcProcess::done, this, [this] {
qCDebug(dockerDeviceLog) << "Process exited:" << m_process.commandLine() qCDebug(dockerDeviceLog) << "Process exited:" << m_process.commandLine()
<< "with code:" << m_process.resultData().m_exitCode; << "with code:" << m_process.resultData().m_exitCode;
emit done(m_process.resultData());
Utils::ProcessResultData resultData = m_process.resultData();
if (m_remotePID == 0) {
resultData.m_error = QProcess::FailedToStart;
qCWarning(dockerDeviceLog) << "Process failed to start:" << m_process.commandLine();
QByteArray stdOut = m_process.readAllRawStandardOutput();
QByteArray stdErr = m_process.readAllRawStandardError();
if (!stdOut.isEmpty())
qCWarning(dockerDeviceLog) << "stdout:" << stdOut;
if (!stdErr.isEmpty())
qCWarning(dockerDeviceLog) << "stderr:" << stdErr;
}
emit done(resultData);
}); });
} }
@@ -699,6 +716,7 @@ bool DockerDevicePrivate::startContainer()
m_shell = std::make_unique<ContainerShell>(m_settings, m_container, q->rootPath()); m_shell = std::make_unique<ContainerShell>(m_settings, m_container, q->rootPath());
connect(m_shell.get(), &DeviceShell::done, this, [this](const ProcessResultData &resultData) { connect(m_shell.get(), &DeviceShell::done, this, [this](const ProcessResultData &resultData) {
if (m_shell)
m_shell.release()->deleteLater(); m_shell.release()->deleteLater();
if (resultData.m_error != QProcess::UnknownError if (resultData.m_error != QProcess::UnknownError
|| resultData.m_exitStatus == QProcess::NormalExit) || resultData.m_exitStatus == QProcess::NormalExit)