flewkey
/
cuberite-2a
1
0
Fork 0
Code Releases Activity

Potential spawn prepare fix (#3924)

This commit is contained in:
peterbell10 2017-08-22 13:34:43 +01:00 committed by Mattes D
parent e44a0adfcf
commit cc2d719c59
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/SpawnPrepare.cpp
View File

@ -12,17 +12,18 @@ class cSpawnPrepareCallback :
public cChunkCoordCallback public cChunkCoordCallback
{ {
public: public:
cSpawnPrepareCallback(cSpawnPrepare & a_SpawnPrepare) : cSpawnPrepareCallback(std::shared_ptr<cSpawnPrepare> a_SpawnPrepare) :
m_SpawnPrepare(a_SpawnPrepare) m_SpawnPrepare(std::move(a_SpawnPrepare))
{ {
ASSERT(m_SpawnPrepare != nullptr);
} }
protected: protected:
cSpawnPrepare & m_SpawnPrepare; std::shared_ptr<cSpawnPrepare> m_SpawnPrepare;
virtual void Call(int a_ChunkX, int a_ChunkZ, bool a_IsSuccess) override virtual void Call(int a_ChunkX, int a_ChunkZ, bool a_IsSuccess) override
{ {
m_SpawnPrepare.PreparedChunkCallback(a_ChunkX, a_ChunkZ); m_SpawnPrepare->PreparedChunkCallback(a_ChunkX, a_ChunkZ);
} }
}; };
@ -30,7 +31,7 @@ protected:
cSpawnPrepare::cSpawnPrepare(cWorld & a_World, int a_SpawnChunkX, int a_SpawnChunkZ, int a_PrepareDistance, int a_FirstIdx): cSpawnPrepare::cSpawnPrepare(cWorld & a_World, int a_SpawnChunkX, int a_SpawnChunkZ, int a_PrepareDistance, int a_FirstIdx, sMakeSharedTag):
m_World(a_World), m_World(a_World),
m_SpawnChunkX(a_SpawnChunkX), m_SpawnChunkX(a_SpawnChunkX),
m_SpawnChunkZ(a_SpawnChunkZ), m_SpawnChunkZ(a_SpawnChunkZ),
@ -55,18 +56,18 @@ void cSpawnPrepare::PrepareChunks(cWorld & a_World, int a_SpawnChunkX, int a_Spa
// Queue the initial chunks: // Queue the initial chunks:
int MaxIdx = a_PrepareDistance * a_PrepareDistance; int MaxIdx = a_PrepareDistance * a_PrepareDistance;
int maxQueue = std::min(MaxIdx - 1, 100); // Number of chunks to queue at once int maxQueue = std::min(MaxIdx - 1, 100); // Number of chunks to queue at once
cSpawnPrepare prep(a_World, a_SpawnChunkX, a_SpawnChunkZ, a_PrepareDistance, maxQueue); auto prep = std::make_shared<cSpawnPrepare>(a_World, a_SpawnChunkX, a_SpawnChunkZ, a_PrepareDistance, maxQueue, sMakeSharedTag{});
for (int i = 0; i < maxQueue; i++) for (int i = 0; i < maxQueue; i++)
{ {
int chunkX, chunkZ; int chunkX, chunkZ;
prep.DecodeChunkCoords(i, chunkX, chunkZ); prep->DecodeChunkCoords(i, chunkX, chunkZ);
a_World.PrepareChunk(chunkX, chunkZ, cpp14::make_unique<cSpawnPrepareCallback>(prep)); a_World.PrepareChunk(chunkX, chunkZ, cpp14::make_unique<cSpawnPrepareCallback>(prep));
} // for i } // for i
// Wait for the lighting thread to prepare everything. Event is set in the Call() callback: // Wait for the lighting thread to prepare everything. Event is set in the Call() callback:
if (MaxIdx > 0) if (MaxIdx > 0)
{ {
prep.m_EvtFinished.Wait(); prep->m_EvtFinished.Wait();
} }
} }
@ -108,7 +109,7 @@ void cSpawnPrepare::PreparedChunkCallback(int a_ChunkX, int a_ChunkZ)
{ {
int chunkX, chunkZ; int chunkX, chunkZ;
DecodeChunkCoords(m_NextIdx, chunkX, chunkZ); DecodeChunkCoords(m_NextIdx, chunkX, chunkZ);
m_World.GetLightingThread().QueueChunk(chunkX, chunkZ, cpp14::make_unique<cSpawnPrepareCallback>(*this)); m_World.GetLightingThread().QueueChunk(chunkX, chunkZ, cpp14::make_unique<cSpawnPrepareCallback>(shared_from_this()));
m_NextIdx += 1; m_NextIdx += 1;
} }

11
src/SpawnPrepare.h
View File

@ -6,10 +6,15 @@ class cWorld;
/** Generates and lights the spawn area of the world. Runs as a separate thread. */ /** Generates and lights the spawn area of the world. Runs as a separate thread. */
class cSpawnPrepare class cSpawnPrepare:
public std::enable_shared_from_this<cSpawnPrepare>
{ {
/** Private tag allows public constructors that can only be used with private access. */
struct sMakeSharedTag {};
public: public:
cSpawnPrepare(cWorld & a_World, int a_SpawnChunkX, int a_SpawnChunkZ, int a_PrepareDistance, int a_FirstIdx, sMakeSharedTag);
static void PrepareChunks(cWorld & a_World, int a_SpawnChunkX, int a_SpawnChunkZ, int a_PrepareDistance); static void PrepareChunks(cWorld & a_World, int a_SpawnChunkX, int a_SpawnChunkZ, int a_PrepareDistance);
protected: protected:
@ -36,8 +41,6 @@ protected:
/** Number of chunks prepared when the last progress report was emitted. */ /** Number of chunks prepared when the last progress report was emitted. */
int m_LastReportChunkCount; int m_LastReportChunkCount;
cSpawnPrepare(cWorld & a_World, int a_SpawnChunkX, int a_SpawnChunkZ, int a_PrepareDistance, int a_FirstIdx);
void PreparedChunkCallback(int a_ChunkX, int a_ChunkZ); void PreparedChunkCallback(int a_ChunkX, int a_ChunkZ);
/** Decodes the index into chunk coords. Provides the specific chunk ordering. */ /** Decodes the index into chunk coords. Provides the specific chunk ordering. */