Simplify allocator and raw block navigation

Author: slurmlord

Core/GameEngine/Include/Common/GameMemory.h

@@ -490,7 +490,7 @@ class DynamicMemoryAllocator
 	#endif	// MEMORYPOOL_DEBUG
 #ifdef RTS_ENABLE_CRASHDUMP
 		MemoryPoolSingleBlock* getFirstRawBlock() const;
-		MemoryPoolSingleBlock* getNextRawBlock(MemoryPoolSingleBlock* block) const;
+		MemoryPoolSingleBlock* getNextRawBlock(const MemoryPoolSingleBlock* block) const;
 		void fillAllocationRangeForRawBlock(const MemoryPoolSingleBlock*, MemoryPoolAllocatedRange& allocationRange) const;
 #endif
 };
@@ -517,10 +517,7 @@ class AllocationRangeIterator
 	reference operator*() { return m_range; }
 	pointer operator->() { return &m_range; }
 
-	// Prefix increment
 	AllocationRangeIterator& operator++();
-
-	// Postfix increment
 	AllocationRangeIterator operator++(int);
 
 	friend const bool operator== (const AllocationRangeIterator& a, const AllocationRangeIterator& b);

Core/GameEngine/Include/Common/MiniDumper.h

@@ -63,11 +63,15 @@ class MiniDumper
 	void Initialize(const AsciiString& userDirPath);
 	void ShutDown();
 	void CreateMiniDump(DumpType dumpType);
-	void DumpMemoryObjects(ULONG64& memoryBase, ULONG& memorySize);
 	void CleanupResources();
 	Bool IsDumpThreadStillRunning() const;
 	void ShutdownDumpThread();
 	Bool ShouldWriteDataSegsForModule(const PWCHAR module) const;
+#ifndef DISABLE_GAMEMEMORY
+	void MoveToNextAllocatorWithRawBlocks();
+	void MoveToNextSingleBlock();
+	void DumpMemoryObjects(ULONG64& memoryBase, ULONG& memorySize);
+#endif
 
 	// Callbacks from dbghelp
 	static BOOL CALLBACK MiniDumpCallback(PVOID CallbackParam, PMINIDUMP_CALLBACK_INPUT CallbackInput, PMINIDUMP_CALLBACK_OUTPUT CallbackOutput);

Core/GameEngine/Source/Common/System/GameMemory.cpp

@@ -441,7 +441,7 @@ class MemoryPoolSingleBlock
 
 	MemoryPoolSingleBlock *getNextFreeBlock();
 	void setNextFreeBlock(MemoryPoolSingleBlock *b);
-	MemoryPoolSingleBlock *getNextRawBlock();
+	MemoryPoolSingleBlock *getNextRawBlock() const;
 	void setNextRawBlock(MemoryPoolSingleBlock *b);
 
 #if defined(MEMORYPOOL_DEBUG) || defined(RTS_ENABLE_CRASHDUMP)
@@ -611,7 +611,7 @@ inline void MemoryPoolSingleBlock::setNextFreeBlock(MemoryPoolSingleBlock *b)
 	return the next raw block in this dma. this call assumes that the block
 	in question does NOT belong to a blob, and will assert if not.
 */
-inline MemoryPoolSingleBlock *MemoryPoolSingleBlock::getNextRawBlock()
+inline MemoryPoolSingleBlock *MemoryPoolSingleBlock::getNextRawBlock() const
 {
 	DEBUG_ASSERTCRASH(m_owningBlob == NULL, ("must be called on raw block"));
 	return m_nextBlock;
@@ -2596,7 +2596,7 @@ MemoryPoolSingleBlock* DynamicMemoryAllocator::getFirstRawBlock() const
 	return m_rawBlocks;
 }
 
-MemoryPoolSingleBlock* DynamicMemoryAllocator::getNextRawBlock(MemoryPoolSingleBlock* block) const
+MemoryPoolSingleBlock* DynamicMemoryAllocator::getNextRawBlock(const MemoryPoolSingleBlock* block) const
 {
 	return block->getNextRawBlock();
 }
@@ -3359,11 +3359,19 @@ void AllocationRangeIterator::moveToNextBlob()
 	}
 }
 
-// Prefix increment
-AllocationRangeIterator& AllocationRangeIterator::operator++() { moveToNextBlob(); updateRange(); return *this; }
+AllocationRangeIterator& AllocationRangeIterator::operator++()
+{
+	moveToNextBlob();
+	updateRange();
+	return *this;
+}
 
-// Postfix increment
-AllocationRangeIterator AllocationRangeIterator::operator++(int) { AllocationRangeIterator tmp = *this; ++(*this); return tmp; }
+AllocationRangeIterator AllocationRangeIterator::operator++(int)
+{
+	AllocationRangeIterator tmp = *this;
+	++(*this);
+	return tmp;
+}
 
 const bool operator== (const AllocationRangeIterator& a, const AllocationRangeIterator& b)
 {

Core/GameEngine/Source/Common/System/MiniDumper.cpp

@@ -516,6 +516,32 @@ BOOL MiniDumper::CallbackInternal(const MINIDUMP_CALLBACK_INPUT& input, MINIDUMP
 }
 
 #ifndef DISABLE_GAMEMEMORY
+void MiniDumper::MoveToNextAllocatorWithRawBlocks()
+{
+	// Skip over DMAs that have no raw blocks
+	while (m_currentAllocator && !m_currentAllocator->getFirstRawBlock())
+	{
+		m_currentAllocator = m_currentAllocator->getNextDmaInList();
+	}
+
+	if (m_currentAllocator)
+	{
+		m_currentSingleBlock = m_currentAllocator->getFirstRawBlock();
+	}
+}
+
+void MiniDumper::MoveToNextSingleBlock()
+{
+	DEBUG_ASSERTCRASH(m_currentAllocator != NULL, ("MiniDumper::MoveToNextSingleBlock: m_currentAllocator is NULL"));
+	m_currentSingleBlock = m_currentAllocator->getNextRawBlock(m_currentSingleBlock);
+
+	if (m_currentSingleBlock == NULL)
+	{
+		m_currentAllocator = m_currentAllocator->getNextDmaInList();
+		MoveToNextAllocatorWithRawBlocks();
+	}
+}
+
 void MiniDumper::DumpMemoryObjects(ULONG64& memoryBase, ULONG& memorySize)
 {
 	memorySize = 0;
@@ -531,8 +557,7 @@ void MiniDumper::DumpMemoryObjects(ULONG64& memoryBase, ULONG& memorySize)
 				m_currentPool = TheMemoryPoolFactory->getFirstMemoryPool();
 				m_rangeIter = TheMemoryPoolFactory->cbegin();
 				m_currentAllocator = TheDynamicMemoryAllocator;
-				if (m_currentAllocator)
-					m_currentSingleBlock = m_currentAllocator->getFirstRawBlock();
+				MoveToNextAllocatorWithRawBlocks();
 			}
 			break;
 		case DumpObjectsState_MemoryPools:
@@ -569,7 +594,7 @@ void MiniDumper::DumpMemoryObjects(ULONG64& memoryBase, ULONG& memorySize)
 		{
 			// Iterate through all the direct allocations ("raw blocks") done by DMAs, as these are done outside of the
 			// memory pool factory allocations dumped in the previous phase.
-			if (m_currentAllocator == NULL || m_currentSingleBlock == NULL)
+			if (m_currentAllocator == NULL)
 			{
 				m_dumpObjectsState = DumpObjectsState_Completed;
 				break;
@@ -579,14 +604,7 @@ void MiniDumper::DumpMemoryObjects(ULONG64& memoryBase, ULONG& memorySize)
 			m_currentAllocator->fillAllocationRangeForRawBlock(m_currentSingleBlock, rawBlockRange);
 			memoryBase = reinterpret_cast<ULONG64>(rawBlockRange.allocationAddr);
 			memorySize = rawBlockRange.allocationSize;
-			m_currentSingleBlock = m_currentAllocator->getNextRawBlock(m_currentSingleBlock);
-
-			if (m_currentSingleBlock == NULL)
-			{
-				m_currentAllocator = m_currentAllocator->getNextDmaInList();
-				if (m_currentAllocator)
-					m_currentSingleBlock = m_currentAllocator->getFirstRawBlock();
-			}
+			MoveToNextSingleBlock();
 			break;
 		}
 		case DumpObjectsState_Completed: