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

FileStreamer: Optimize transfer on the same device

Browse Source 
Run just "cp" on device instead of transferring the content of the
source into local and sending it back again to remote.

Change-Id: I703ad1181d77d470ae145691979c34fc75b59a97
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Jarek Kobus
2023-03-02 23:44:36 +01:00
parent c1b1842c48
commit 30760747a3
1 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/libs/utils/filestreamer.cpp
View File

@@ -304,7 +304,21 @@ QTC_DECLARE_CUSTOM_TASK(Writer, Utils::FileStreamWriterAdapter);
namespace Utils { namespace Utils {
static Group interDeviceTransfer(const FilePath &source, const FilePath &destination) static Group sameRemoteDeviceTransferTask(const FilePath &source, const FilePath &destination)
{
QTC_CHECK(source.needsDevice());
QTC_CHECK(destination.needsDevice());
QTC_CHECK(source.isSameDevice(destination));
const auto setup = [source, destination](QtcProcess &process) {
const QStringList args = {source.path(), destination.path()};
const FilePath cp = source.withNewPath("cp");
process.setCommand({cp, args, OsType::OsTypeLinux});
};
return {Process(setup)};
}
static Group interDeviceTransferTask(const FilePath &source, const FilePath &destination)
{ {
struct TransferStorage { QPointer<FileStreamWriter> writer; }; struct TransferStorage { QPointer<FileStreamWriter> writer; };
Condition condition; Condition condition;
@@ -342,12 +356,19 @@ static Group interDeviceTransfer(const FilePath &source, const FilePath &destina
return root; return root;
} }
static Group transferTask(const FilePath &source, const FilePath &destination)
{
if (source.needsDevice() && destination.needsDevice() && source.isSameDevice(destination))
return sameRemoteDeviceTransferTask(source, destination);
return interDeviceTransferTask(source, destination);
}
static void transfer(QPromise<void> &promise, const FilePath &source, const FilePath &destination) static void transfer(QPromise<void> &promise, const FilePath &source, const FilePath &destination)
{ {
if (promise.isCanceled()) if (promise.isCanceled())
return; return;
std::unique_ptr<TaskTree> taskTree(new TaskTree(interDeviceTransfer(source, destination))); std::unique_ptr<TaskTree> taskTree(new TaskTree(transferTask(source, destination)));
QEventLoop eventLoop; QEventLoop eventLoop;
bool finalized = false; bool finalized = false;