sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

(MemoryPool) Added methods to construct/destruct object 

Former-commit-id: cd58a108ff201be6e242701eb762e0151695f6e3
This commit is contained in:
Lynix 2015-03-01 00:02:41 +01:00
parent 655be2864f
commit e55574cb8b
2 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/Nazara/Core/MemoryPool.hpp
View File

@ -19,15 +19,16 @@ class NzMemoryPool
NzMemoryPool(NzMemoryPool&& pool) noexcept; NzMemoryPool(NzMemoryPool&& pool) noexcept;
~NzMemoryPool() = default; ~NzMemoryPool() = default;
template<typename T> T* Allocate();
void* Allocate(unsigned int size); void* Allocate(unsigned int size);
template<typename T> void Delete(T* ptr);
void Free(void* ptr); void Free(void* ptr);
unsigned int GetBlockSize() const; unsigned int GetBlockSize() const;
unsigned int GetFreeBlocks() const; unsigned int GetFreeBlocks() const;
unsigned int GetSize() const; unsigned int GetSize() const;
template<typename T, typename... Args> T* New(Args&&... args);
NzMemoryPool& operator=(const NzMemoryPool&) = delete; NzMemoryPool& operator=(const NzMemoryPool&) = delete;
NzMemoryPool& operator=(NzMemoryPool&& pool) noexcept; NzMemoryPool& operator=(NzMemoryPool&& pool) noexcept;

29
include/Nazara/Core/MemoryPool.inl
View File

@ -32,12 +32,6 @@ NzMemoryPool(pool->m_blockSize, pool->m_size, pool->m_canGrow)
m_previous = pool; m_previous = pool;
} }
template<typename T>
inline T* NzMemoryPool::Allocate()
{
return static_cast<T*>(Allocate(sizeof(T)));
}
inline void* NzMemoryPool::Allocate(unsigned int size) inline void* NzMemoryPool::Allocate(unsigned int size)
{ {
if (size <= m_blockSize) if (size <= m_blockSize)
@ -56,6 +50,16 @@ inline void* NzMemoryPool::Allocate(unsigned int size)
return NzOperatorNew(size); return NzOperatorNew(size);
} }
template<typename T>
inline void NzMemoryPool::Delete(T* ptr)
{
if (ptr)
{
ptr->~T();
Free(ptr);
}
}
inline void NzMemoryPool::Free(void* ptr) inline void NzMemoryPool::Free(void* ptr)
{ {
if (ptr) if (ptr)
@ -72,7 +76,7 @@ inline void NzMemoryPool::Free(void* ptr)
m_freeList[m_freeCount++] = ptr; m_freeList[m_freeCount++] = ptr;
// Si nous sommes vide et l'extension d'un autre pool, on se suicide // Si nous sommes vide et l'extension d'un autre pool, nous nous suicidons
if (m_freeCount == m_size && m_previous && !m_next) if (m_freeCount == m_size && m_previous && !m_next)
{ {
m_previous->m_next.release(); m_previous->m_next.release();
@ -104,11 +108,20 @@ inline unsigned int NzMemoryPool::GetSize() const
return m_size; return m_size;
} }
template<typename T, typename... Args>
inline T* NzMemoryPool::New(Args&&... args)
{
T* object = static_cast<T*>(Allocate(sizeof(T)));
NzPlacementNew<T>(object, std::forward<Args>(args)...);
return object;
}
inline NzMemoryPool& NzMemoryPool::operator=(NzMemoryPool&& pool) noexcept inline NzMemoryPool& NzMemoryPool::operator=(NzMemoryPool&& pool) noexcept
{ {
m_blockSize = m_blockSize; m_blockSize = m_blockSize;
m_canGrow = m_canGrow; m_canGrow = m_canGrow;
m_freeCount = m_freeCount.load(); m_freeCount = m_freeCount.load(std::memory_order_relaxed);
m_freeList = std::move(m_freeList); m_freeList = std::move(m_freeList);
m_pool = std::move(m_pool); m_pool = std::move(m_pool);
m_previous = m_previous; m_previous = m_previous;