(MemoryPool) Removed template and added movement

Former-commit-id: 0a6c890f9ebc84c3c8139c244b5232467cf06bf0

include/Nazara/Core/MemoryPool.hpp

@@ -11,11 +11,12 @@
 #include <atomic>
 #include <memory>
 
-template<unsigned int blockSize, bool canGrow = true>
 class NzMemoryPool
 {
 	public:
-		NzMemoryPool(unsigned int size = 1024);
+		NzMemoryPool(unsigned int blockSize, unsigned int size = 1024, bool canGrow = true);
+		NzMemoryPool(const NzMemoryPool&) = delete;
+		NzMemoryPool(NzMemoryPool&& pool) noexcept;
 		~NzMemoryPool() = default;
 
 		template<typename T> T* Allocate();
@@ -23,9 +24,13 @@ class NzMemoryPool
 
 		void Free(void* ptr);
 
+		unsigned int GetBlockSize() const;
 		unsigned int GetFreeBlocks() const;
 		unsigned int GetSize() const;
 
+		NzMemoryPool& operator=(const NzMemoryPool&) = delete;
+		NzMemoryPool& operator=(NzMemoryPool&& pool) noexcept;
+
 	private:
 		NzMemoryPool(NzMemoryPool* pool);
 
@@ -34,6 +39,8 @@ class NzMemoryPool
 		std::unique_ptr<NzMemoryPool> m_next;
 		std::atomic_uint m_freeCount;
 		NzMemoryPool* m_previous;
+		bool m_canGrow;
+		unsigned int m_blockSize;
 		unsigned int m_size;
 };
 

include/Nazara/Core/MemoryPool.inl

@@ -3,46 +3,48 @@
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
 #include <Nazara/Core/MemoryHelper.hpp>
+#include <utility>
 #include <Nazara/Core/Debug.hpp>
 
-template<unsigned int blockSize, bool canGrow>
+inline NzMemoryPool::NzMemoryPool(unsigned int blockSize, unsigned int size, bool canGrow) :
-NzMemoryPool<blockSize, canGrow>::NzMemoryPool(unsigned int count) :
+m_freeCount(size),
-m_freeCount(count),
 m_previous(nullptr),
-m_size(count)
+m_canGrow(canGrow),
+m_blockSize(blockSize),
+m_size(size)
 {
-	m_pool.reset(new nzUInt8[blockSize * count]);
+	m_pool.reset(new nzUInt8[blockSize * size]);
-	m_freeList.reset(new void*[count]);
+	m_freeList.reset(new void*[size]);
 
 	// Remplissage de la free list
-	for (unsigned int i = 0; i < count; ++i)
+	for (unsigned int i = 0; i < size; ++i)
-		m_freeList[i] = &m_pool[blockSize * (count-i-1)];
+		m_freeList[i] = &m_pool[m_blockSize * (size-i-1)];
 }
 
-template<unsigned int blockSize, bool canGrow>
+inline NzMemoryPool::NzMemoryPool(NzMemoryPool&& pool) noexcept
-NzMemoryPool<blockSize, canGrow>::NzMemoryPool(NzMemoryPool* pool) :
+{
-NzMemoryPool(pool->m_size)
+	operator=(std::move(pool));
+}
+
+inline NzMemoryPool::NzMemoryPool(NzMemoryPool* pool) :
+NzMemoryPool(pool->m_blockSize, pool->m_size, pool->m_canGrow)
 {
 	m_previous = pool;
 }
 
-template<unsigned int blockSize, bool canGrow>
 template<typename T>
-T* NzMemoryPool<blockSize, canGrow>::Allocate()
+inline T* NzMemoryPool::Allocate()
 {
-	static_assert(sizeof(T) <= blockSize, "This type is too large for this memory pool");
-
 	return static_cast<T*>(Allocate(sizeof(T)));
 }
 
-template<unsigned int blockSize, bool canGrow>
+inline void* NzMemoryPool::Allocate(unsigned int size)
-void* NzMemoryPool<blockSize, canGrow>::Allocate(unsigned int size)
 {
-	if (size <= blockSize)
+	if (size <= m_blockSize)
 	{
 		if (m_freeCount > 0)
 			return m_freeList[--m_freeCount];
-		else if (canGrow)
+		else if (m_canGrow)
 		{
 			if (!m_next)
 				m_next.reset(new NzMemoryPool(this));
@@ -54,22 +56,18 @@ void* NzMemoryPool<blockSize, canGrow>::Allocate(unsigned int size)
 	return NzOperatorNew(size);
 }
 
-template<unsigned int blockSize, bool canGrow>
+inline void NzMemoryPool::Free(void* ptr)
-void NzMemoryPool<blockSize, canGrow>::Free(void* ptr)
 {
 	if (ptr)
 	{
-		// Le pointer nous appartient-il ?
+		// Le pointeur nous appartient-il ?
 		nzUInt8* freePtr = static_cast<nzUInt8*>(ptr);
 		nzUInt8* poolPtr = m_pool.get();
-		if (freePtr >= poolPtr && freePtr < poolPtr + blockSize*m_size)
+		if (freePtr >= poolPtr && freePtr < poolPtr + m_blockSize*m_size)
 		{
 			#if NAZARA_CORE_SAFE
-			if ((freePtr - poolPtr) % blockSize != 0)
+			if ((freePtr - poolPtr) % m_blockSize != 0)
-			{
+				throw std::runtime_error("Invalid pointer (does not point to an element of the pool)");
-				throw std::runtime_error("Pointer does not belong to memory pool");
-				return;
-			}
 			#endif
 
 			m_freeList[m_freeCount++] = ptr;
@@ -91,16 +89,40 @@ void NzMemoryPool<blockSize, canGrow>::Free(void* ptr)
 	}
 }
 
-template<unsigned int blockSize, bool canGrow>
+inline unsigned int NzMemoryPool::GetBlockSize() const
-unsigned int NzMemoryPool<blockSize, canGrow>::GetFreeBlocks() const
+{
+	return m_blockSize;
+}
+
+inline unsigned int NzMemoryPool::GetFreeBlocks() const
 {
 	return m_freeCount;
 }
 
-template<unsigned int blockSize, bool canGrow>
+inline unsigned int NzMemoryPool::GetSize() const
-unsigned int NzMemoryPool<blockSize, canGrow>::GetSize() const
 {
 	return m_size;
 }
 
+inline NzMemoryPool& NzMemoryPool::operator=(NzMemoryPool&& pool) noexcept
+{
+	m_blockSize = m_blockSize;
+	m_canGrow = m_canGrow;
+	m_freeCount = m_freeCount.load();
+	m_freeList = std::move(m_freeList);
+	m_pool = std::move(m_pool);
+	m_previous = m_previous;
+	m_next = std::move(m_next);
+	m_size = m_size;
+
+	// Si nous avons été créés par un autre pool, nous devons le faire pointer vers nous de nouveau
+	if (m_previous)
+	{
+		m_previous->m_next.release();
+		m_previous->m_next.reset(this);
+	}
+
+	return *this;
+}
+
 #include <Nazara/Core/DebugOff.hpp>