summaryrefslogtreecommitdiffstats
path: root/src/WorldStorage/WorldStorage.h
diff options
context:
space:
mode:
authorTycho Bickerstaff <work.tycho@gmail.com>2014-01-02 18:37:34 +0100
committerTycho Bickerstaff <work.tycho@gmail.com>2014-01-02 18:37:34 +0100
commitbbdb34252e9c1023405b58585fd5999cc8f39b45 (patch)
treec8e4e878217b4a8c478b650fd2408f1601bafdd6 /src/WorldStorage/WorldStorage.h
parentrewrote queue not to use promises for waits (diff)
downloadcuberite-bbdb34252e9c1023405b58585fd5999cc8f39b45.tar
cuberite-bbdb34252e9c1023405b58585fd5999cc8f39b45.tar.gz
cuberite-bbdb34252e9c1023405b58585fd5999cc8f39b45.tar.bz2
cuberite-bbdb34252e9c1023405b58585fd5999cc8f39b45.tar.lz
cuberite-bbdb34252e9c1023405b58585fd5999cc8f39b45.tar.xz
cuberite-bbdb34252e9c1023405b58585fd5999cc8f39b45.tar.zst
cuberite-bbdb34252e9c1023405b58585fd5999cc8f39b45.zip
Diffstat (limited to 'src/WorldStorage/WorldStorage.h')
-rw-r--r--src/WorldStorage/WorldStorage.h9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/WorldStorage/WorldStorage.h b/src/WorldStorage/WorldStorage.h
index 98eb5fce7..06cae1717 100644
--- a/src/WorldStorage/WorldStorage.h
+++ b/src/WorldStorage/WorldStorage.h
@@ -116,15 +116,10 @@ protected:
cWorld * m_World;
AString m_StorageSchemaName;
-
- // Both queues are locked by the same CS
- cCriticalSection m_CSQueues;
+
sChunkLoadQueue m_LoadQueue;
cChunkCoordsQueue m_SaveQueue;
- cEvent m_Event; // Set when there's any addition to the queues
- cEvent m_evtRemoved; // Set when an item has been removed from the queue, either by the worker thread or the Unqueue methods
-
/// All the storage schemas (all used for loading)
cWSSchemaList m_Schemas;
@@ -135,6 +130,8 @@ protected:
virtual void Execute(void) override;
+ cEvent m_Event; // Set when there's any addition to the queues
+
/// Loads one chunk from the queue (if any queued); returns true if there are more chunks in the load queue
bool LoadOneChunk(void);