diff options
author | Tycho <work.tycho+git@gmail.com> | 2014-06-16 16:12:50 +0200 |
---|---|---|
committer | Tycho <work.tycho+git@gmail.com> | 2014-06-16 16:12:50 +0200 |
commit | ee50790398791c38e563eee04cf12780fab74baf (patch) | |
tree | 2bbcebf1be2e567dce3f684884d8650c29883bd4 /src/ChunkMap.h | |
parent | Fix a few warnings (diff) | |
download | cuberite-ee50790398791c38e563eee04cf12780fab74baf.tar cuberite-ee50790398791c38e563eee04cf12780fab74baf.tar.gz cuberite-ee50790398791c38e563eee04cf12780fab74baf.tar.bz2 cuberite-ee50790398791c38e563eee04cf12780fab74baf.tar.lz cuberite-ee50790398791c38e563eee04cf12780fab74baf.tar.xz cuberite-ee50790398791c38e563eee04cf12780fab74baf.tar.zst cuberite-ee50790398791c38e563eee04cf12780fab74baf.zip |
Diffstat (limited to '')
-rw-r--r-- | src/ChunkMap.h | 27 |
1 files changed, 26 insertions, 1 deletions
diff --git a/src/ChunkMap.h b/src/ChunkMap.h index 7e85bb6f1..5aad0dd2a 100644 --- a/src/ChunkMap.h +++ b/src/ChunkMap.h @@ -351,7 +351,11 @@ private: class cChunkLayer { public: - cChunkLayer(int a_LayerX, int a_LayerZ, cChunkMap * a_Parent); + cChunkLayer( + int a_LayerX, int a_LayerZ, + cChunkMap * a_Parent, + cAllocationPool<cChunkData::sChunkSection> & a_Pool + ); ~cChunkLayer(); /** Always returns an assigned chunkptr, but the chunk needn't be valid (loaded / generated) - callers must check */ @@ -395,6 +399,25 @@ private: int m_LayerZ; cChunkMap * m_Parent; int m_NumChunksLoaded; + + cAllocationPool<cChunkData::sChunkSection> & m_Pool; + }; + + class cStarvationCallbacks + : public cAllocationPool<cChunkData::sChunkSection>::cStarvationCallbacks + { + virtual void OnStartUsingReserve() override + { + LOG("Using backup memory buffer"); + } + virtual void OnEndUsingReserve() override + { + LOG("Stoped using backup memory buffer"); + } + virtual void OnOutOfReserve() override + { + LOG("Out of Memory"); + } }; typedef std::list<cChunkLayer *> cChunkLayerList; @@ -427,6 +450,8 @@ private: /** The cChunkStay descendants that are currently enabled in this chunkmap */ cChunkStays m_ChunkStays; + std::auto_ptr<cAllocationPool<cChunkData::sChunkSection>> m_Pool; + cChunkPtr GetChunk (int a_ChunkX, int a_ChunkY, int a_ChunkZ); // Also queues the chunk for loading / generating if not valid cChunkPtr GetChunkNoGen (int a_ChunkX, int a_ChunkY, int a_ChunkZ); // Also queues the chunk for loading if not valid; doesn't generate cChunkPtr GetChunkNoLoad(int a_ChunkX, int a_ChunkY, int a_ChunkZ); // Doesn't load, doesn't generate |