diff options
| author | Hein-Pieter van Braam <hp@tmm.cx> | 2018-07-26 01:26:46 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-26 01:26:46 +0200 |
| commit | 832e2bfcd38965a01a9149d509169dd197e42f58 (patch) | |
| tree | 18b7ff35f1eeee39031a16e9c1d834ebf03d44cf /core/os | |
| parent | 9423f23ffb80c946dec380f73f3f313ec44d0d18 (diff) | |
| parent | 0e29f7974b59e4440cf02e1388fb9d8ab2b5c5fd (diff) | |
Merge pull request #20137 from hpvb/reduce-vector-cow
Reduce unnecessary COW on Vector by make writing explicit
Diffstat (limited to 'core/os')
| -rw-r--r-- | core/os/file_access.cpp | 8 | ||||
| -rw-r--r-- | core/os/threaded_array_processor.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/core/os/file_access.cpp b/core/os/file_access.cpp index 033b4b12b9..3eac4428da 100644 --- a/core/os/file_access.cpp +++ b/core/os/file_access.cpp @@ -262,15 +262,15 @@ String FileAccess::get_token() const { while (!eof_reached()) { if (c <= ' ') { - if (!token.empty()) + if (token.length()) break; } else { - token.push_back(c); + token += c; } c = get_8(); } - token.push_back(0); + token += '0'; return String::utf8(token.get_data()); } @@ -293,7 +293,7 @@ class CharBuffer { for (int i = 0; i < written; i++) { - vector[i] = stack_buffer[i]; + vector.write[i] = stack_buffer[i]; } } diff --git a/core/os/threaded_array_processor.h b/core/os/threaded_array_processor.h index e0fb589767..3ff7db2a44 100644 --- a/core/os/threaded_array_processor.h +++ b/core/os/threaded_array_processor.h @@ -80,7 +80,7 @@ void thread_process_array(uint32_t p_elements, C *p_instance, M p_method, U p_us threads.resize(OS::get_singleton()->get_processor_count()); for (int i = 0; i < threads.size(); i++) { - threads[i] = Thread::create(process_array_thread<ThreadArrayProcessData<C, U> >, &data); + threads.write[i] = Thread::create(process_array_thread<ThreadArrayProcessData<C, U> >, &data); } for (int i = 0; i < threads.size(); i++) { |