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

Changed names of callbacks

Browse Source
This commit is contained in:
Tycho 2014-06-14 20:24:52 +01:00
parent 6ddcf42409
commit 8a2aa6cb16
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/AllocationPool.h
View File

@ -13,14 +13,14 @@ public:
virtual ~cStarvationCallbacks() {} virtual ~cStarvationCallbacks() {}
/** Is called when the reserve buffer starts to be used **/ /** Is called when the reserve buffer starts to be used **/
virtual void OnStartingUsingBuffer() = 0; virtual void OnStartUsingReserve() = 0;
/** Is called once the reserve buffer has returned to normal size **/ /** Is called once the reserve buffer has returned to normal size **/
virtual void OnStopUsingBuffer() = 0; virtual void OnEndUsingReserve() = 0;
/** Is called when the allocation pool is unable to allocate memory. Will be repeatedly /** Is called when the allocation pool is unable to allocate memory. Will be repeatedly
called if it does not free sufficient memory **/ called if it does not free sufficient memory **/
virtual void OnBufferEmpty() = 0; virtual void OnOutOfReserve() = 0;
}; };
virtual ~cAllocationPool() {} virtual ~cAllocationPool() {}
@ -47,7 +47,7 @@ class cListAllocationPool : public cAllocationPool<T>
void * space = malloc(sizeof(T)); void * space = malloc(sizeof(T));
if (space == NULL) if (space == NULL)
{ {
m_Callbacks->OnStartingUsingBuffer(); m_Callbacks->OnStartUsingReserve();
break; break;
} }
m_FreeList.push_front(space); m_FreeList.push_front(space);
@ -74,11 +74,11 @@ class cListAllocationPool : public cAllocationPool<T>
} }
else if (m_FreeList.size() == NumElementsInReserve) else if (m_FreeList.size() == NumElementsInReserve)
{ {
m_Callbacks->OnStartingUsingBuffer(); m_Callbacks->OnStartUsingReserve();
} }
else if (m_FreeList.empty()) else if (m_FreeList.empty())
{ {
m_Callbacks->OnBufferEmpty(); m_Callbacks->OnOutOfReserve();
// Try again until the memory is avalable // Try again until the memory is avalable
return Allocate(); return Allocate();
} }
@ -99,7 +99,7 @@ class cListAllocationPool : public cAllocationPool<T>
m_FreeList.push_front(a_ptr); m_FreeList.push_front(a_ptr);
if (m_FreeList.size() == NumElementsInReserve) if (m_FreeList.size() == NumElementsInReserve)
{ {
m_Callbacks->OnStopUsingBuffer(); m_Callbacks->OnEndUsingReserve();
} }
} }

6
src/ChunkMap.h
View File

@ -406,15 +406,15 @@ private:
class cStarvationCallbacks class cStarvationCallbacks
: public cAllocationPool<cChunkData::sChunkSection>::cStarvationCallbacks : public cAllocationPool<cChunkData::sChunkSection>::cStarvationCallbacks
{ {
virtual void OnStartingUsingBuffer() virtual void OnStartUsingReserve()
{ {
LOG("Using backup memory buffer"); LOG("Using backup memory buffer");
} }
virtual void OnStopUsingBuffer() virtual void OnEndUsingReserve()
{ {
LOG("Stoped using backup memory buffer"); LOG("Stoped using backup memory buffer");
} }
virtual void OnBufferEmpty() virtual void OnOutOfReserve()
{ {
LOG("Out of Memory"); LOG("Out of Memory");
} }