godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #63223 from m4gr3d/fix_slow_copy_3x

Browse Source 
[3.x] Address slow copy performance when using the `FileAccessFilesystemJAndroid` implementation
This commit is contained in:
Rémi Verschelde 2022-07-22 00:21:59 +02:00 committed by GitHub
commit c8099e9524
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
core/os/dir_access.cpp
View File

@ -298,11 +298,16 @@ Error DirAccess::copy(String p_from, String p_to, int p_chmod_flags) {
return err; return err;
} }
const size_t copy_buffer_limit = 65536; // 64 KB
fsrc->seek_end(0); fsrc->seek_end(0);
int size = fsrc->get_position(); int size = fsrc->get_position();
fsrc->seek(0); fsrc->seek(0);
err = OK; err = OK;
while (size--) { size_t buffer_size = MIN(size * sizeof(uint8_t), copy_buffer_limit);
LocalVector<uint8_t> buffer;
buffer.resize(buffer_size);
while (size > 0) {
if (fsrc->get_error() != OK) { if (fsrc->get_error() != OK) {
err = fsrc->get_error(); err = fsrc->get_error();
break; break;
@ -312,7 +317,14 @@ Error DirAccess::copy(String p_from, String p_to, int p_chmod_flags) {
break; break;
} }
fdst->store_8(fsrc->get_8()); int bytes_read = fsrc->get_buffer(buffer.ptr(), buffer_size);
if (bytes_read <= 0) {
err = FAILED;
break;
}
fdst->store_buffer(buffer.ptr(), bytes_read);
size -= bytes_read;
} }
if (err == OK && p_chmod_flags != -1) { if (err == OK && p_chmod_flags != -1) {