diff options
| author | madmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2012-02-28 17:59:59 +0100 |
|---|---|---|
| committer | madmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2012-02-28 17:59:59 +0100 |
| commit | 5d0da9a2c04673eaceb630c7d38dddf4b80d2183 (patch) | |
| tree | d75a180edc54274c069c0269061060408cbdd5cd /source/WorldStorage.cpp | |
| parent | Setting the m_bDestroyed flag only after the cClienthandle is truly destroyed; cClientHandle's destructor now locks loaded chunk lists (diff) | |
| download | cuberite-5d0da9a2c04673eaceb630c7d38dddf4b80d2183.tar cuberite-5d0da9a2c04673eaceb630c7d38dddf4b80d2183.tar.gz cuberite-5d0da9a2c04673eaceb630c7d38dddf4b80d2183.tar.bz2 cuberite-5d0da9a2c04673eaceb630c7d38dddf4b80d2183.tar.lz cuberite-5d0da9a2c04673eaceb630c7d38dddf4b80d2183.tar.xz cuberite-5d0da9a2c04673eaceb630c7d38dddf4b80d2183.tar.zst cuberite-5d0da9a2c04673eaceb630c7d38dddf4b80d2183.zip | |
Diffstat (limited to '')
| -rw-r--r-- | source/WorldStorage.cpp | 32 |
1 files changed, 20 insertions, 12 deletions
diff --git a/source/WorldStorage.cpp b/source/WorldStorage.cpp index 2bebbbad5..a3d9b50b2 100644 --- a/source/WorldStorage.cpp +++ b/source/WorldStorage.cpp @@ -199,17 +199,20 @@ int cWorldStorage::GetSaveQueueLength(void) void cWorldStorage::QueueLoadChunk(int a_ChunkX, int a_ChunkY, int a_ChunkZ, bool a_Generate)
{
// Queues the chunk for loading; if not loaded, the chunk will be generated
- cCSLock Lock(m_CSQueues);
-
- // Check if already in the queue:
- for (sChunkLoadQueue::iterator itr = m_LoadQueue.begin(); itr != m_LoadQueue.end(); ++itr)
{
- if ((itr->m_ChunkX == a_ChunkX) && (itr->m_ChunkY == a_ChunkY) && (itr->m_ChunkZ == a_ChunkZ) && (itr->m_Generate == a_Generate))
+ cCSLock Lock(m_CSQueues);
+
+ // Check if already in the queue:
+ for (sChunkLoadQueue::iterator itr = m_LoadQueue.begin(); itr != m_LoadQueue.end(); ++itr)
{
- return;
+ if ((itr->m_ChunkX == a_ChunkX) && (itr->m_ChunkY == a_ChunkY) && (itr->m_ChunkZ == a_ChunkZ) && (itr->m_Generate == a_Generate))
+ {
+ return;
+ }
}
+ m_LoadQueue.push_back(sChunkLoad(a_ChunkX, a_ChunkY, a_ChunkZ, a_Generate));
}
- m_LoadQueue.push_back(sChunkLoad(a_ChunkX, a_ChunkY, a_ChunkZ, a_Generate));
+
m_Event.Set();
}
@@ -219,9 +222,11 @@ void cWorldStorage::QueueLoadChunk(int a_ChunkX, int a_ChunkY, int a_ChunkZ, boo void cWorldStorage::QueueSaveChunk(int a_ChunkX, int a_ChunkY, int a_ChunkZ)
{
- cCSLock Lock(m_CSQueues);
- m_SaveQueue.remove (cChunkCoords(a_ChunkX, a_ChunkY, a_ChunkZ)); // Don't add twice
- m_SaveQueue.push_back(cChunkCoords(a_ChunkX, a_ChunkY, a_ChunkZ));
+ {
+ cCSLock Lock(m_CSQueues);
+ m_SaveQueue.remove (cChunkCoords(a_ChunkX, a_ChunkY, a_ChunkZ)); // Don't add twice
+ m_SaveQueue.push_back(cChunkCoords(a_ChunkX, a_ChunkY, a_ChunkZ));
+ }
m_Event.Set();
}
@@ -239,6 +244,7 @@ void cWorldStorage::UnqueueLoad(int a_ChunkX, int a_ChunkY, int a_ChunkZ) continue;
}
m_LoadQueue.erase(itr);
+ Lock.Unlock();
m_evtRemoved.Set();
return;
} // for itr - m_LoadQueue[]
@@ -250,8 +256,10 @@ void cWorldStorage::UnqueueLoad(int a_ChunkX, int a_ChunkY, int a_ChunkZ) void cWorldStorage::UnqueueSave(const cChunkCoords & a_Chunk)
{
- cCSLock Lock(m_CSQueues);
- m_SaveQueue.remove(a_Chunk);
+ {
+ cCSLock Lock(m_CSQueues);
+ m_SaveQueue.remove(a_Chunk);
+ }
m_evtRemoved.Set();
}
|