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

Docker: Improve File contents read speed

Browse Source 
Change-Id: Ic94715d2c362ac3aa75dabf4f95c74737abd6264
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Marcus Tillmanns
2022-09-29 15:03:29 +02:00
parent 8d67bc36a7
commit 34dc092642
1 changed files with 25 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -128,6 +128,8 @@ public:
bool runInShell(const CommandLine &cmd, const QByteArray &stdInData = {});
QByteArray outputForRunInShell(const CommandLine &cmd);
std::optional<QByteArray> fileContents(const FilePath &filePath, qint64 limit, qint64 offset);
void updateContainerAccess();
void changeMounts(QStringList newMounts);
bool ensureReachable(const FilePath &other);
@@ -1010,25 +1012,7 @@ std::optional<QByteArray> DockerDevice::fileContents(const FilePath &filePath,
qint64 offset) const
{
QTC_ASSERT(handlesFile(filePath), return {});
updateContainerAccess();
QStringList args = {"if=" + filePath.path(), "status=none"};
if (limit > 0 || offset > 0) {
const qint64 gcd = std::gcd(limit, offset);
args += {QString("bs=%1").arg(gcd),
QString("count=%1").arg(limit / gcd),
QString("seek=%1").arg(offset / gcd)};
}
QtcProcess proc;
proc.setCommand(d->withDockerExecCmd({"dd", args}));
proc.start();
proc.waitForFinished();
if (proc.result() != ProcessResult::FinishedWithSuccess)
return {};
QByteArray output = proc.readAllStandardOutput();
return output;
return d->fileContents(filePath, limit, offset);
}
bool DockerDevice::writeFileContents(const FilePath &filePath, const QByteArray &data) const
@@ -1048,6 +1032,28 @@ void DockerDevice::aboutToBeRemoved() const
detector.undoAutoDetect(id().toString());
}
std::optional<QByteArray> DockerDevicePrivate::fileContents(const FilePath &filePath,
qint64 limit,
qint64 offset)
{
updateContainerAccess();
QStringList args = {"if=" + filePath.path(), "status=none"};
if (limit > 0 || offset > 0) {
const qint64 gcd = std::gcd(limit, offset);
args += {QString("bs=%1").arg(gcd),
QString("count=%1").arg(limit / gcd),
QString("seek=%1").arg(offset / gcd)};
}
const ContainerShell::RunResult r = m_shell->outputForRunInShell({"dd", args});
if (r.exitCode != 0)
return {};
return r.stdOut;
}
void DockerDevicePrivate::fetchSystemEnviroment()
{
updateContainerAccess();