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/io/file_access_network.cpp | |
| parent | 9423f23ffb80c946dec380f73f3f313ec44d0d18 (diff) | |
| parent | 0e29f7974b59e4440cf02e1388fb9d8ab2b5c5fd (diff) | |
| download | redot-engine-832e2bfcd38965a01a9149d509169dd197e42f58.tar.gz | |
Merge pull request #20137 from hpvb/reduce-vector-cow
Reduce unnecessary COW on Vector by make writing explicit
Diffstat (limited to 'core/io/file_access_network.cpp')
| -rw-r--r-- | core/io/file_access_network.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/core/io/file_access_network.cpp b/core/io/file_access_network.cpp index 21e3a4172b..e0a2dbf507 100644 --- a/core/io/file_access_network.cpp +++ b/core/io/file_access_network.cpp @@ -258,8 +258,8 @@ void FileAccessNetwork::_set_block(int p_offset, const Vector<uint8_t> &p_block) } buffer_mutex->lock(); - pages[page].buffer = p_block; - pages[page].queued = false; + pages.write[page].buffer = p_block; + pages.write[page].queued = false; buffer_mutex->unlock(); if (waiting_on_page == page) { @@ -389,7 +389,7 @@ void FileAccessNetwork::_queue_page(int p_page) const { br.offset = size_t(p_page) * page_size; br.size = page_size; nc->block_requests.push_back(br); - pages[p_page].queued = true; + pages.write[p_page].queued = true; nc->blockrequest_mutex->unlock(); DEBUG_PRINT("QUEUE PAGE POST"); nc->sem->post(); @@ -433,12 +433,12 @@ int FileAccessNetwork::get_buffer(uint8_t *p_dst, int p_length) const { _queue_page(page + j); } - buff = pages[page].buffer.ptrw(); + buff = pages.write[page].buffer.ptrw(); //queue pages buffer_mutex->unlock(); } - buff = pages[page].buffer.ptrw(); + buff = pages.write[page].buffer.ptrw(); last_page_buff = buff; last_page = page; } |