From aab26ad7d286cb6017da314326bc8a5f47abb8a1 Mon Sep 17 00:00:00 2001 From: Fredia Huya-Kouadio Date: Tue, 19 Jul 2022 23:02:28 -0400 Subject: [PATCH] Address slow copy performance when using the `FileAccessFilesystemJAndroid` implementation. Read/write ops for this implementation are done through the java layer via jni, and so for good performance, it's key to avoid numerous repeated small read/write ops due the jni overhead. The alternative is to allocate a (conversatively-sized) large buffer to reduce the number of read/write ops over the jni boundary. --- core/os/dir_access.cpp | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/core/os/dir_access.cpp b/core/os/dir_access.cpp index 4aa30547b0e..ae966a3c5d7 100644 --- a/core/os/dir_access.cpp +++ b/core/os/dir_access.cpp @@ -298,11 +298,16 @@ Error DirAccess::copy(String p_from, String p_to, int p_chmod_flags) { return err; } + const size_t copy_buffer_limit = 65536; // 64 KB + fsrc->seek_end(0); int size = fsrc->get_position(); fsrc->seek(0); err = OK; - while (size--) { + size_t buffer_size = MIN(size * sizeof(uint8_t), copy_buffer_limit); + LocalVector buffer; + buffer.resize(buffer_size); + while (size > 0) { if (fsrc->get_error() != OK) { err = fsrc->get_error(); break; @@ -312,7 +317,14 @@ Error DirAccess::copy(String p_from, String p_to, int p_chmod_flags) { 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) {