diff options
author | Hein-Pieter van Braam <hp@tmm.cx> | 2018-07-25 03:11:03 +0200 |
---|---|---|
committer | Hein-Pieter van Braam <hp@tmm.cx> | 2018-07-26 00:54:16 +0200 |
commit | 0e29f7974b59e4440cf02e1388fb9d8ab2b5c5fd (patch) | |
tree | 18b7ff35f1eeee39031a16e9c1d834ebf03d44cf /main/tests | |
parent | 9423f23ffb80c946dec380f73f3f313ec44d0d18 (diff) |
Reduce unnecessary COW on Vector by make writing explicit
This commit makes operator[] on Vector const and adds a write proxy to it. From
now on writes to Vectors need to happen through the .write proxy. So for
instance:
Vector<int> vec;
vec.push_back(10);
std::cout << vec[0] << std::endl;
vec.write[0] = 20;
Failing to use the .write proxy will cause a compilation error.
In addition COWable datatypes can now embed a CowData pointer to their data.
This means that String, CharString, and VMap no longer use or derive from
Vector.
_ALWAYS_INLINE_ and _FORCE_INLINE_ are now equivalent for debug and non-debug
builds. This is a lot faster for Vector in the editor and while running tests.
The reason why this difference used to exist is because force-inlined methods
used to give a bad debugging experience. After extensive testing with modern
compilers this is no longer the case.
Diffstat (limited to 'main/tests')
-rw-r--r-- | main/tests/test_gdscript.cpp | 4 | ||||
-rw-r--r-- | main/tests/test_io.cpp | 2 | ||||
-rw-r--r-- | main/tests/test_math.cpp | 4 | ||||
-rw-r--r-- | main/tests/test_physics.cpp | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/main/tests/test_gdscript.cpp b/main/tests/test_gdscript.cpp index 5f3a2c1dc8..0a9d03c1b7 100644 --- a/main/tests/test_gdscript.cpp +++ b/main/tests/test_gdscript.cpp @@ -924,8 +924,8 @@ MainLoop *test(TestType p_type) { Vector<uint8_t> buf; int flen = fa->get_len(); buf.resize(fa->get_len() + 1); - fa->get_buffer(&buf[0], flen); - buf[flen] = 0; + fa->get_buffer(buf.ptrw(), flen); + buf.write[flen] = 0; String code; code.parse_utf8((const char *)&buf[0]); diff --git a/main/tests/test_io.cpp b/main/tests/test_io.cpp index 08dc374ed1..4f98955995 100644 --- a/main/tests/test_io.cpp +++ b/main/tests/test_io.cpp @@ -103,7 +103,7 @@ MainLoop *test() { int len = z->get_len(); Vector<uint8_t> zip; zip.resize(len); - z->get_buffer(&zip[0], len); + z->get_buffer(zip.ptrw(), len); z->close(); memdelete(z); diff --git a/main/tests/test_math.cpp b/main/tests/test_math.cpp index 8b71c5dc70..1a72416d6a 100644 --- a/main/tests/test_math.cpp +++ b/main/tests/test_math.cpp @@ -503,8 +503,8 @@ MainLoop *test() { Vector<uint8_t> buf; int flen = fa->get_len(); buf.resize(fa->get_len() + 1); - fa->get_buffer(&buf[0], flen); - buf[flen] = 0; + fa->get_buffer(buf.ptrw(), flen); + buf.write[flen] = 0; String code; code.parse_utf8((const char *)&buf[0]); diff --git a/main/tests/test_physics.cpp b/main/tests/test_physics.cpp index 475663dabe..99c8fce70e 100644 --- a/main/tests/test_physics.cpp +++ b/main/tests/test_physics.cpp @@ -228,11 +228,11 @@ protected: for (int i = 0; i < p_width; i++) { - grid[i].resize(p_height); + grid.write[i].resize(p_height); for (int j = 0; j < p_height; j++) { - grid[i][j] = 1.0 + Math::random(-p_cellheight, p_cellheight); + grid.write[i].write[j] = 1.0 + Math::random(-p_cellheight, p_cellheight); } } |