31a11a6df4
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
97 lines
2.2 KiB
C++
97 lines
2.2 KiB
C++
|
|
// CopyBlocks.cpp
|
|
|
|
// Implements the test for cChunkData::CopyBlockTypes() range copying
|
|
|
|
|
|
|
|
|
|
|
|
#include "Globals.h"
|
|
#include "ChunkData.h"
|
|
|
|
|
|
|
|
|
|
|
|
int main(int argc, char ** argv)
|
|
{
|
|
LOGD("Test started");
|
|
|
|
// Set up a cChunkData with known contents - all blocks 0x01, all metas 0x02:
|
|
class cMockAllocationPool
|
|
: public cAllocationPool<cChunkData::sChunkSection>
|
|
{
|
|
virtual cChunkData::sChunkSection * Allocate() override
|
|
{
|
|
return new cChunkData::sChunkSection();
|
|
}
|
|
|
|
virtual void Free(cChunkData::sChunkSection * a_Ptr) override
|
|
{
|
|
delete a_Ptr;
|
|
}
|
|
|
|
virtual bool DoIsEqual(const cAllocationPool<cChunkData::sChunkSection> &) const NOEXCEPT override
|
|
{
|
|
return false;
|
|
}
|
|
} Pool;
|
|
cChunkData Data(Pool);
|
|
cChunkDef::BlockTypes BlockTypes;
|
|
cChunkDef::BlockNibbles BlockMetas;
|
|
memset(BlockTypes, 0x01, sizeof(BlockTypes));
|
|
memset(BlockMetas, 0x02, sizeof(BlockMetas));
|
|
Data.SetBlockTypes(BlockTypes);
|
|
Data.SetMetas(BlockMetas);
|
|
|
|
// Try to read varying amounts of blocktypes from the cChunkData.
|
|
// Verify that the exact amount of memory is copied, by copying to a larger buffer and checking its boundaries
|
|
BLOCKTYPE TestBuffer[5 * cChunkDef::NumBlocks];
|
|
size_t WritePosIdx = 2 * cChunkDef::NumBlocks;
|
|
BLOCKTYPE * WritePosition = &TestBuffer[WritePosIdx];
|
|
memset(TestBuffer, 0x03, sizeof(TestBuffer));
|
|
size_t LastReportedStep = 1;
|
|
for (size_t idx = 0; idx < 5000; idx += 73)
|
|
{
|
|
if (idx / 500 != LastReportedStep)
|
|
{
|
|
printf("Testing index %u...\n", static_cast<unsigned>(idx));
|
|
LastReportedStep = idx / 500;
|
|
}
|
|
|
|
for (size_t len = 3; len < 700; len += 13)
|
|
{
|
|
Data.CopyBlockTypes(WritePosition, idx, len);
|
|
|
|
// Verify the data copied:
|
|
for (size_t i = 0; i < len; i++)
|
|
{
|
|
assert_test(WritePosition[i] == 0x01);
|
|
}
|
|
// Verify the space before the copied data hasn't been changed:
|
|
for (size_t i = 0; i < WritePosIdx; i++)
|
|
{
|
|
assert_test(TestBuffer[i] == 0x03);
|
|
}
|
|
// Verify the space after the copied data hasn't been changed:
|
|
for (size_t i = WritePosIdx + idx + len; i < ARRAYCOUNT(TestBuffer); i++)
|
|
{
|
|
assert_test(TestBuffer[i] == 0x03);
|
|
}
|
|
|
|
// Re-initialize the buffer for the next test:
|
|
for (size_t i = 0; i < len; i++)
|
|
{
|
|
WritePosition[i] = 0x03;
|
|
}
|
|
} // for len
|
|
} // for idx
|
|
return 0;
|
|
}
|
|
|
|
|
|
|
|
|
|
|