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

rewrote queue not to use promises for waits

Browse Source
This commit is contained in:
Tycho Bickerstaff
2014-01-02 12:32:55 +00:00
parent 7694a0788c
commit 042b72bc17
6 changed files with 24 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/WorldStorage/WorldStorage.cpp
View File

@@ -13,7 +13,6 @@
#include "../Generating/ChunkGenerator.h"
#include "../Entities/Entity.h"
#include "../BlockEntities/BlockEntity.h"
#include "../OSSupport/Promise.h"
@@ -100,7 +99,7 @@ void cWorldStorage::WaitForFinish(void)
}
// Wait for the saving to finish:
WaitForQueuesEmpty();
WaitForSaveQueueEmpty();
// Wait for the thread to finish:
m_ShouldTerminate = true;
@@ -114,21 +113,15 @@ void cWorldStorage::WaitForFinish(void)
void cWorldStorage::WaitForQueuesEmpty(void)
void cWorldStorage::WaitForLoadQueueEmpty(void)
{
cPromise * LoadPromise = m_LoadQueue.BlockTillEmpty();
cPromise * SavePromise = m_SaveQueue.BlockTillEmpty();
cPromise * QueuePromise = LoadPromise->WaitFor(SavePromise);
cPromise * CancelPromise = QueuePromise->CancelOn(m_ShouldTerminate);
CancelPromise->Wait();
delete CancelPromise;
delete QueuePromise;
delete SavePromise;
delete LoadPromise;
m_LoadQueue.BlockTillEmpty();
}
void cWorldStorage::WaitForSaveQueueEmpty(void)
{
m_SaveQueue.BlockTillEmpty();
}