From 31a11a6df4922b590a50a5ff3d3c00d42a45599d Mon Sep 17 00:00:00 2001 From: peterbell10 Date: Mon, 23 Jul 2018 19:12:51 +0100 Subject: Optimise chunk set (#4260) Closes #1244 Initially I was just going to add the cChunkData to cSetChunkData but profiling revealed that the copying wasn't even the biggest slowdown. Much more time was being spent in cChunk::CreateBlockEntities and cChunk::WakeUpSimulators than was in memcpy so I've made those significantly faster as well. Optimisations performed: * cSetChunkData now stores blocks in a cChunkData object * cChunkData objects can now perform moves even if they are using different pools * cChunk::CreateBlockEntities now iterates in the correct order and only over present chunk sections * Similarly for cChunk::WakeUpSimulators * cSetChunkData::CalculateHeightMap now shortcuts to the highest present chunk section before checking blocks directly --- tests/ChunkData/ArraytoCoord.cpp | 9 +++++++-- tests/ChunkData/Coordinates.cpp | 9 +++++++-- tests/ChunkData/Copies.cpp | 9 +++++++-- tests/ChunkData/CopyBlocks.cpp | 13 +++++++++---- tests/ChunkData/creatable.cpp | 13 +++++++++---- 5 files changed, 39 insertions(+), 14 deletions(-) (limited to 'tests') diff --git a/tests/ChunkData/ArraytoCoord.cpp b/tests/ChunkData/ArraytoCoord.cpp index 1591bc9a7..440730e46 100644 --- a/tests/ChunkData/ArraytoCoord.cpp +++ b/tests/ChunkData/ArraytoCoord.cpp @@ -11,15 +11,20 @@ int main(int argc, char** argv) class cMockAllocationPool : public cAllocationPool { - virtual cChunkData::sChunkSection * Allocate() + virtual cChunkData::sChunkSection * Allocate() override { return new cChunkData::sChunkSection(); } - virtual void Free(cChunkData::sChunkSection * a_Ptr) + virtual void Free(cChunkData::sChunkSection * a_Ptr) override { delete a_Ptr; } + + virtual bool DoIsEqual(const cAllocationPool &) const NOEXCEPT override + { + return false; + } } Pool; { diff --git a/tests/ChunkData/Coordinates.cpp b/tests/ChunkData/Coordinates.cpp index 31aa1179e..304df191f 100644 --- a/tests/ChunkData/Coordinates.cpp +++ b/tests/ChunkData/Coordinates.cpp @@ -11,15 +11,20 @@ int main(int argc, char** argv) class cMockAllocationPool : public cAllocationPool { - virtual cChunkData::sChunkSection * Allocate() + virtual cChunkData::sChunkSection * Allocate() override { return new cChunkData::sChunkSection(); } - virtual void Free(cChunkData::sChunkSection * a_Ptr) + virtual void Free(cChunkData::sChunkSection * a_Ptr) override { delete a_Ptr; } + + virtual bool DoIsEqual(const cAllocationPool &) const NOEXCEPT override + { + return false; + } } Pool; { cChunkData buffer(Pool); diff --git a/tests/ChunkData/Copies.cpp b/tests/ChunkData/Copies.cpp index b4d9c3721..7fc027ece 100644 --- a/tests/ChunkData/Copies.cpp +++ b/tests/ChunkData/Copies.cpp @@ -11,15 +11,20 @@ int main(int argc, char** argv) class cMockAllocationPool : public cAllocationPool { - virtual cChunkData::sChunkSection * Allocate() + virtual cChunkData::sChunkSection * Allocate() override { return new cChunkData::sChunkSection(); } - virtual void Free(cChunkData::sChunkSection * a_Ptr) + virtual void Free(cChunkData::sChunkSection * a_Ptr) override { delete a_Ptr; } + + virtual bool DoIsEqual(const cAllocationPool&) const NOEXCEPT override + { + return false; + } } Pool; { cChunkData buffer(Pool); diff --git a/tests/ChunkData/CopyBlocks.cpp b/tests/ChunkData/CopyBlocks.cpp index 8253ac2ec..623ed208b 100644 --- a/tests/ChunkData/CopyBlocks.cpp +++ b/tests/ChunkData/CopyBlocks.cpp @@ -21,16 +21,21 @@ int main(int argc, char ** argv) // Set up a cChunkData with known contents - all blocks 0x01, all metas 0x02: class cMockAllocationPool : public cAllocationPool - { - virtual cChunkData::sChunkSection * Allocate() + { + virtual cChunkData::sChunkSection * Allocate() override { return new cChunkData::sChunkSection(); } - - virtual void Free(cChunkData::sChunkSection * a_Ptr) + + virtual void Free(cChunkData::sChunkSection * a_Ptr) override { delete a_Ptr; } + + virtual bool DoIsEqual(const cAllocationPool &) const NOEXCEPT override + { + return false; + } } Pool; cChunkData Data(Pool); cChunkDef::BlockTypes BlockTypes; diff --git a/tests/ChunkData/creatable.cpp b/tests/ChunkData/creatable.cpp index a879c3dd7..260583213 100644 --- a/tests/ChunkData/creatable.cpp +++ b/tests/ChunkData/creatable.cpp @@ -8,16 +8,21 @@ int main(int argc, char** argv) class cMockAllocationPool : public cAllocationPool - { - virtual cChunkData::sChunkSection * Allocate() + { + virtual cChunkData::sChunkSection * Allocate() override { return new cChunkData::sChunkSection(); } - - virtual void Free(cChunkData::sChunkSection * a_Ptr) + + virtual void Free(cChunkData::sChunkSection * a_Ptr) override { delete a_Ptr; } + + virtual bool DoIsEqual(const cAllocationPool &) const NOEXCEPT override + { + return false; + } } Pool; cChunkData buffer(Pool); return 0; -- cgit v1.2.3