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

device: Use multiplex script to allow multithread support

Browse Source 
Previously the runInShell and outputForRunInShell methods were
exclusively processed single threaded, meaning all calls
were processed sequentially. With the multiplexed
helper script we can now run multiple processes simultaneously.
( see tst_manual_deviceshell )

Additionally the new script allows us to capture both
stdout and stderr from commands which was not possible previously.

Change-Id: I52f4fb46d872dc274edb9c11872d2f6543741b34
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
Marcus Tillmanns
2022-05-13 15:13:35 +02:00
parent 13146fb0bd
commit 0135c47849
13 changed files with 937 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -135,7 +135,7 @@ public:
~DockerDevicePrivate() { stopCurrentContainer(); }
bool runInContainer(const CommandLine &cmd) const;
bool runInShell(const CommandLine &cmd) const;
bool runInShell(const CommandLine &cmd, const QByteArray &stdInData = {}) const;
QByteArray outputForRunInShell(const CommandLine &cmd) const;
void updateContainerAccess();
@@ -485,7 +485,8 @@ void DockerDevicePrivate::startContainer()
"or restart Qt Creator."));
});
if (!m_shell->waitForStarted()) {
if (m_shell->state() != DeviceShell::State::Succeeded) {
m_shell.reset();
DockerApi::recheckDockerDaemon();
qCWarning(dockerDeviceLog) << "Container shell failed to start";
}
@@ -979,28 +980,8 @@ bool DockerDevice::writeFileContents(const FilePath &filePath, const QByteArray
QTC_ASSERT(handlesFile(filePath), return {});
updateContainerAccess();
// This following would be the generic Unix solution.
// But it doesn't pass input. FIXME: Why?
// QtcProcess proc;
// proc.setCommand({"dd", {"of=" + filePath.path()}});
// proc.setWriteData(data);
// runProcess(proc);
// proc.waitForFinished();
TemporaryFile tempFile("dockertransport-XXXXXX");
tempFile.open();
tempFile.write(data);
const QString tempName = tempFile.fileName();
tempFile.close();
CommandLine cmd{"docker", {"cp", tempName, d->m_container + ':' + filePath.path()}};
QtcProcess proc;
proc.setCommand(cmd);
proc.runBlocking();
return proc.exitCode() == 0;
QTC_ASSERT(handlesFile(filePath), return {});
return d->runInShell({"dd", {"of=" + filePath.path()}}, data);
}
Environment DockerDevice::systemEnvironment() const
@@ -1058,16 +1039,16 @@ bool DockerDevicePrivate::runInContainer(const CommandLine &cmd) const
return exitCode == 0;
}
bool DockerDevicePrivate::runInShell(const CommandLine &cmd) const
bool DockerDevicePrivate::runInShell(const CommandLine &cmd, const QByteArray& stdInData) const
{
QTC_ASSERT(m_shell, return false);
return m_shell->runInShell(cmd);
return m_shell->runInShell(cmd, stdInData);
}
QByteArray DockerDevicePrivate::outputForRunInShell(const CommandLine &cmd) const
{
QTC_ASSERT(m_shell.get(), return {});
return m_shell->outputForRunInShell(cmd).stdOutput;
return m_shell->outputForRunInShell(cmd).stdOut;
}
// Factory