Simplified shutdown and cleanup

Author: slurmlord

Core/GameEngine/Include/Common/MiniDumper.h

@@ -57,6 +57,7 @@ class MiniDumper
 	BOOL DumpMemoryObjects(ULONG64& memoryBase, ULONG& memorySize);
 	void CleanupResources();
 	Bool IsDumpThreadStillRunning() const;
+	void ShutdownDumpThread();
 
 	// Callbacks from dbghelp
 	static BOOL CALLBACK MiniDumpCallback(PVOID CallbackParam, PMINIDUMP_CALLBACK_INPUT CallbackInput, PMINIDUMP_CALLBACK_OUTPUT CallbackOutput);

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

@@ -734,8 +734,9 @@ void ReleaseCrash(const char *reason)
 		// Do dumps both with and without extended info
 		TheMiniDumper->TriggerMiniDump(DUMP_TYPE_MINIMAL);
 		TheMiniDumper->TriggerMiniDump(DUMP_TYPE_GAMEMEMORY);
-		MiniDumper::shutdownMiniDumper();
 	}
+
+	MiniDumper::shutdownMiniDumper();
 #endif
 
 	char prevbuf[ _MAX_PATH ];
@@ -809,8 +810,9 @@ void ReleaseCrashLocalized(const AsciiString& p, const AsciiString& m)
 		// Do dumps both with and without extended info
 		TheMiniDumper->TriggerMiniDump(DUMP_TYPE_MINIMAL);
 		TheMiniDumper->TriggerMiniDump(DUMP_TYPE_GAMEMEMORY);
-		MiniDumper::shutdownMiniDumper();
 	}
+
+	MiniDumper::shutdownMiniDumper();
 #endif
 
 	UnicodeString prompt = TheGameText->fetch(p);

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

@@ -176,22 +176,19 @@ void MiniDumper::Initialize(const AsciiString& userDirPath)
 	{
 		// Something went wrong with the creation of the events..
 		DEBUG_LOG(("MiniDumper::Initialize: Unable to create events: error=%u", ::GetLastError()));
-		CleanupResources();
 		return;
 	}
 
 	m_dumpThread = ::CreateThread(NULL, 0, MiniDumpThreadProc, this, CREATE_SUSPENDED, &m_dumpThreadId);
 	if (!m_dumpThread)
 	{
 		DEBUG_LOG(("MiniDumper::Initialize: Unable to create thread: error=%u", ::GetLastError()));
-		CleanupResources();
 		return;
 	}
 
-	if (!::ResumeThread(m_dumpThread))
+	if (::ResumeThread(m_dumpThread) != 1)
 	{
 		DEBUG_LOG(("MiniDumper::Initialize: Unable to resume thread: error=%u", ::GetLastError()));
-		CleanupResources();
 		return;
 	}
 
@@ -207,7 +204,7 @@ Bool MiniDumper::IsInitialized() const
 Bool MiniDumper::IsDumpThreadStillRunning() const
 {
 	DWORD exitCode;
-	if (::GetExitCodeThread(m_dumpThread, &exitCode) && exitCode == STILL_ACTIVE)
+	if (m_dumpThread != NULL && ::GetExitCodeThread(m_dumpThread, &exitCode) && exitCode == STILL_ACTIVE)
 	{
 		return true;
 	}
@@ -238,15 +235,50 @@ Bool MiniDumper::InitializeDumpDirectory(const AsciiString& userDirPath)
 	return true;
 }
 
-void MiniDumper::CleanupResources()
+void MiniDumper::ShutdownDumpThread()
 {
+	if (IsDumpThreadStillRunning())
+	{
+		DEBUG_ASSERTCRASH(m_quitting != NULL, ("MiniDumper::ShutdownDumpThread: Dump thread still running despite m_quitting being NULL"));
+		::SetEvent(m_quitting);
+
+		DWORD waitRet = ::WaitForSingleObject(m_dumpThread, 3000);
+		if (waitRet != WAIT_OBJECT_0)
+		{
+			if (waitRet == WAIT_TIMEOUT)
+			{
+				DEBUG_LOG(("MiniDumper::ShutdownDumpThread: Waiting for dumping thread to exit timed out, killing thread", waitRet));
+				::TerminateThread(m_dumpThread, DUMPER_EXIT_FORCED_TERMINATE);
+			}
+			else if (waitRet == WAIT_FAILED)
+			{
+				DEBUG_LOG(("MiniDumper::ShutdownDumpThread: Waiting for minidump triggering failed: status=%u, error=%u", waitRet, ::GetLastError()));
+			}
+			else
+			{
+				DEBUG_LOG(("MiniDumper::ShutdownDumpThread: Waiting for minidump triggering failed: status=%u", waitRet));
+			}
+		}
+	}
+}
+
+void MiniDumper::ShutDown()
+{
+	ShutdownDumpThread();
+
 	if (m_dumpThread != NULL)
 	{
-		DEBUG_ASSERTCRASH(!IsDumpThreadStillRunning(), ("MiniDumper::CleanupResources() called while Dump thread still active"));
+		DEBUG_ASSERTCRASH(!IsDumpThreadStillRunning(), ("MiniDumper::ShutDown: ShutdownDumpThread() was unable to stop Dump thread"));
 		::CloseHandle(m_dumpThread);
 		m_dumpThread = NULL;
 	}
 
+	if (m_quitting != NULL)
+	{
+		::CloseHandle(m_quitting);
+		m_quitting = NULL;
+	}
+
 	if (m_dumpComplete != NULL)
 	{
 		::CloseHandle(m_dumpComplete);
@@ -259,52 +291,12 @@ void MiniDumper::CleanupResources()
 		m_dumpRequested = NULL;
 	}
 
-	if (m_quitting != NULL)
+	if (m_loadedDbgHelp)
 	{
-		::CloseHandle(m_quitting);
-		m_quitting = NULL;
-	}
-
-	DbgHelpLoader::unload();
-	m_loadedDbgHelp = false;
-}
-
-void MiniDumper::ShutDown()
-{
-	if (!m_miniDumpInitialized)
-	{
-		// Even if we failed to initialize, DbgHelpLoader could still have loaded its library
-		if (m_loadedDbgHelp)
-		{
-			DbgHelpLoader::unload();
-			m_loadedDbgHelp = false;
-		}
-
-		return;
-	}
-
-	::SetEvent(m_quitting);
-	DWORD waitRet = ::WaitForSingleObject(m_dumpThread, 3000);
-	if (waitRet != WAIT_OBJECT_0)
-	{
-		if (waitRet == WAIT_TIMEOUT)
-		{
-			DEBUG_LOG(("MiniDumper::ShutDown: Waiting for dumping thread to exit timed out, killing thread", waitRet));
-			::TerminateThread(m_dumpThread, DUMPER_EXIT_FORCED_TERMINATE);
-		}
-		else if (waitRet == WAIT_FAILED)
-		{
-			DEBUG_LOG(("MiniDumper::ShutDown: Waiting for minidump triggering failed: status=%u, error=%u", waitRet, ::GetLastError()));
-		}
-		else
-		{
-			DEBUG_LOG(("MiniDumper::ShutDown: Waiting for minidump triggering failed: status=%u", waitRet));
-		}
-
-		return;
+		DbgHelpLoader::unload();
+		m_loadedDbgHelp = false;
 	}
 
-	CleanupResources();
 	m_miniDumpInitialized = false;
 }
 

Generals/Code/Main/WinMain.cpp

@@ -750,8 +750,9 @@ static LONG WINAPI UnHandledExceptionFilter( struct _EXCEPTION_POINTERS* e_info
 		// Do dumps both with and without extended info
 		TheMiniDumper->TriggerMiniDumpForException(e_info, DUMP_TYPE_MINIMAL);
 		TheMiniDumper->TriggerMiniDumpForException(e_info, DUMP_TYPE_GAMEMEMORY);
-		MiniDumper::shutdownMiniDumper();
 	}
+
+	MiniDumper::shutdownMiniDumper();
 #endif
 	return EXCEPTION_EXECUTE_HANDLER;
 }

GeneralsMD/Code/Main/WinMain.cpp

@@ -772,8 +772,9 @@ static LONG WINAPI UnHandledExceptionFilter( struct _EXCEPTION_POINTERS* e_info
 		// Do dumps both with and without extended info
 		TheMiniDumper->TriggerMiniDumpForException(e_info, DUMP_TYPE_MINIMAL);
 		TheMiniDumper->TriggerMiniDumpForException(e_info, DUMP_TYPE_GAMEMEMORY);
-		MiniDumper::shutdownMiniDumper();
 	}
+
+	MiniDumper::shutdownMiniDumper();
 #endif
 	return EXCEPTION_EXECUTE_HANDLER;
 }