Remove integration with GameMemory, offer Small and Full dump types

Author: slurmlord

Core/GameEngine/Include/Common/GameMemory.h

@@ -223,9 +223,6 @@ class MemoryPool;
 class MemoryPoolFactory;
 class DynamicMemoryAllocator;
 class BlockCheckpointInfo;
-#ifdef RTS_ENABLE_CRASHDUMP
-class AllocationRangeIterator;
-#endif
 
 // TYPE DEFINES ///////////////////////////////////////////////////////////////
 
@@ -282,14 +279,6 @@ class Checkpointable
 };
 #endif
 
-#ifdef RTS_ENABLE_CRASHDUMP
-struct MemoryPoolAllocatedRange
-{
-	const char* allocationAddr;
-	size_t allocationSize;
-};
-#endif
-
 // ----------------------------------------------------------------------------
 /**
 	A MemoryPool provides a way to efficiently allocate objects of the same (or similar)
@@ -395,9 +384,6 @@ class MemoryPool
 		/// return true iff this block was allocated by this pool.
 		Bool debugIsBlockInPool(void *pBlock);
 	#endif
-#ifdef RTS_ENABLE_CRASHDUMP
-		friend class AllocationRangeIterator;
-#endif
 };
 
 // ----------------------------------------------------------------------------
@@ -488,52 +474,13 @@ class DynamicMemoryAllocator
 		Bool debugIsPoolInDma(MemoryPool *pool);
 
 	#endif	// MEMORYPOOL_DEBUG
-#ifdef RTS_ENABLE_CRASHDUMP
-		MemoryPoolSingleBlock* getFirstRawBlock() const;
-		MemoryPoolSingleBlock* getNextRawBlock(const MemoryPoolSingleBlock* block) const;
-		void fillAllocationRangeForRawBlock(const MemoryPoolSingleBlock*, MemoryPoolAllocatedRange& allocationRange) const;
-#endif
 };
 
 // ----------------------------------------------------------------------------
 #ifdef MEMORYPOOL_DEBUG
 enum { MAX_SPECIAL_USED = 256 };
 #endif
 
-#ifdef RTS_ENABLE_CRASHDUMP
-class AllocationRangeIterator
-{
-	typedef const MemoryPoolAllocatedRange value_type;
-	typedef const MemoryPoolAllocatedRange* pointer;
-	typedef const MemoryPoolAllocatedRange& reference;
-
-public:
-
-	AllocationRangeIterator();
-	AllocationRangeIterator(const MemoryPoolFactory* factory);
-	AllocationRangeIterator(MemoryPool& pool, MemoryPoolBlob& blob);
-	AllocationRangeIterator(MemoryPool* pool, MemoryPoolBlob* blob);
-
-	reference operator*() { return m_range; }
-	pointer operator->() { return &m_range; }
-
-	AllocationRangeIterator& operator++();
-	AllocationRangeIterator operator++(int);
-
-	friend const bool operator== (const AllocationRangeIterator& a, const AllocationRangeIterator& b);
-	friend const bool operator!= (const AllocationRangeIterator& a, const AllocationRangeIterator& b);
-
-private:
-
-	void updateRange();
-	void moveToNextBlob();
-	const MemoryPoolFactory* m_factory;
-	MemoryPool* m_currentPool;
-	MemoryPoolBlob* m_currentBlobInPool;
-	MemoryPoolAllocatedRange m_range;
-};
-#endif
-
 // ----------------------------------------------------------------------------
 /**
 	The class that manages all the MemoryPools and DynamicMemoryAllocators.
@@ -626,20 +573,6 @@ class MemoryPoolFactory
 		void debugResetCheckpoints();
 
 	#endif
-#ifdef RTS_ENABLE_CRASHDUMP
-		AllocationRangeIterator cbegin() const
-		{
-			return AllocationRangeIterator(this);
-		}
-
-		AllocationRangeIterator cend() const
-		{
-			return AllocationRangeIterator(NULL, NULL);
-		}
-
-		MemoryPool* getFirstMemoryPool() const;
-		friend class AllocationRangeIterator;
-#endif
 };
 
 // how many bytes are we allowed to 'waste' per pool allocation before the debug code starts yelling at us...

Core/GameEngine/Include/Common/MiniDumper.h

@@ -25,8 +25,6 @@ enum DumpType CPP_11(: Char)
 {
 	// Smallest dump type with call stacks and some supporting variables
 	DumpType_Minimal = 'M',
-	// Large dump including all memory regions allocated by the GameMemory implementation
-	DumpType_Gamememory = 'X',
 	// Largest dump size including complete memory contents of the process
 	DumpType_Full = 'F',
 };
@@ -41,15 +39,6 @@ class MiniDumper
 		MiniDumperExitCode_ForcedTerminate = 0x158B1154,
 	};
 
-	enum DumpObjectsState CPP_11(: Int)
-	{
-		DumpObjectsState_Begin,
-		DumpObjectsState_MemoryPools,
-		DumpObjectsState_MemoryPoolAllocations,
-		DumpObjectsState_DMAAllocations,
-		DumpObjectsState_Completed
-	};
-
 public:
 	MiniDumper();
 	Bool IsInitialized() const;
@@ -66,16 +55,6 @@ class MiniDumper
 	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);
-	BOOL CallbackInternal(const MINIDUMP_CALLBACK_INPUT& input, MINIDUMP_CALLBACK_OUTPUT& output);
 
 	// Thread procs
 	static DWORD WINAPI MiniDumpThreadProc(LPVOID lpParam);
@@ -112,16 +91,6 @@ class MiniDumper
 	// Thread handles
 	HANDLE m_dumpThread;
 	DWORD m_dumpThreadId;
-
-#ifndef DISABLE_GAMEMEMORY
-	// Internal memory dumping progress state
-	DumpObjectsState m_dumpObjectsState;
-	DynamicMemoryAllocator* m_currentAllocator;
-	MemoryPool* m_currentPool;
-	MemoryPoolSingleBlock* m_currentSingleBlock;
-
-	AllocationRangeIterator m_rangeIter;
-#endif
 };
 
 extern MiniDumper* TheMiniDumper;

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

@@ -736,9 +736,9 @@ static void TriggerMiniDump()
 #ifdef RTS_ENABLE_CRASHDUMP
 	if (TheMiniDumper && TheMiniDumper->IsInitialized())
 	{
-		// Do dumps both with and without extended info
+		// Create both minimal and full memory dumps
 		TheMiniDumper->TriggerMiniDump(DumpType_Minimal);
-		TheMiniDumper->TriggerMiniDump(DumpType_Gamememory);
+		TheMiniDumper->TriggerMiniDump(DumpType_Full);
 	}
 
 	MiniDumper::shutdownMiniDumper();