ShuriZma
/
duckstation
mirror of https://github.com/stenzek/duckstation
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Assertions: Write crash dump on assertion fail

This commit is contained in:
Stenzek 2024-05-25 16:56:50 +10:00
parent 0240ea8b49
commit cca7b46114
No known key found for this signature in database
1 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/common/assert.cpp
View File

@ -1,7 +1,8 @@
// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin <stenzek@gmail.com> // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin <stenzek@gmail.com>
// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) // SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0)
#include "assert.h" #include "assert.h"
#include "crash_handler.h"
#include <cstdio> #include <cstdio>
#include <cstdlib> #include <cstdlib>
#include <mutex> #include <mutex>
@ -84,7 +85,7 @@ void Y_OnAssertFailed(const char* szMessage, const char* szFunction, const char*
FreezeThreads(&pHandle); FreezeThreads(&pHandle);
char szMsg[512]; char szMsg[512];
std::snprintf(szMsg, sizeof(szMsg), "%s in function %s (%s:%u)", szMessage, szFunction, szFile, uLine); std::snprintf(szMsg, sizeof(szMsg), "%s in function %s (%s:%u)\n", szMessage, szFunction, szFile, uLine);
#if defined(_WIN32) #if defined(_WIN32)
SetConsoleTextAttribute(GetStdHandle(STD_ERROR_HANDLE), FOREGROUND_BLUE | FOREGROUND_GREEN | FOREGROUND_INTENSITY); SetConsoleTextAttribute(GetStdHandle(STD_ERROR_HANDLE), FOREGROUND_BLUE | FOREGROUND_GREEN | FOREGROUND_INTENSITY);
@ -93,19 +94,25 @@ void Y_OnAssertFailed(const char* szMessage, const char* szFunction, const char*
std::snprintf( std::snprintf(
szMsg, sizeof(szMsg), szMsg, sizeof(szMsg),
"%s in function %s (%s:%u)\n\nPress Abort to exit, Retry to break to debugger, or Ignore to attempt to continue.", "%s in function %s (%s:%u)\nPress Abort to exit, Retry to break to debugger, or Ignore to attempt to continue.",
szMessage, szFunction, szFile, uLine); szMessage, szFunction, szFile, uLine);
int result = MessageBoxA(NULL, szMsg, NULL, MB_ABORTRETRYIGNORE | MB_ICONERROR); int result = MessageBoxA(NULL, szMsg, NULL, MB_ABORTRETRYIGNORE | MB_ICONERROR);
if (result == IDRETRY) if (result == IDRETRY)
{
__debugbreak(); __debugbreak();
}
else if (result != IDIGNORE) else if (result != IDIGNORE)
{
CrashHandler::WriteDumpForCaller();
TerminateProcess(GetCurrentProcess(), 0xBAADC0DE); TerminateProcess(GetCurrentProcess(), 0xBAADC0DE);
}
#else #else
fputs(szMsg, stderr); std::fputs(szMsg, stderr);
fputs("\nAborting application.\n", stderr); CrashHandler::WriteDumpForCaller();
fflush(stderr); std::fputs("Aborting application.\n", stderr);
abort(); std::fflush(stderr);
std::abort();
#endif #endif
ResumeThreads(pHandle); ResumeThreads(pHandle);
@ -119,7 +126,7 @@ void Y_OnAssertFailed(const char* szMessage, const char* szFunction, const char*
FreezeThreads(&pHandle); FreezeThreads(&pHandle);
char szMsg[512]; char szMsg[512];
std::snprintf(szMsg, sizeof(szMsg), "%s in function %s (%s:%u)", szMessage, szFunction, szFile, uLine); std::snprintf(szMsg, sizeof(szMsg), "%s in function %s (%s:%u)\n", szMessage, szFunction, szFile, uLine);
#if defined(_WIN32) #if defined(_WIN32)
SetConsoleTextAttribute(GetStdHandle(STD_ERROR_HANDLE), FOREGROUND_BLUE | FOREGROUND_GREEN | FOREGROUND_INTENSITY); SetConsoleTextAttribute(GetStdHandle(STD_ERROR_HANDLE), FOREGROUND_BLUE | FOREGROUND_GREEN | FOREGROUND_INTENSITY);
@ -127,20 +134,23 @@ void Y_OnAssertFailed(const char* szMessage, const char* szFunction, const char*
OutputDebugStringA(szMsg); OutputDebugStringA(szMsg);
std::snprintf(szMsg, sizeof(szMsg), std::snprintf(szMsg, sizeof(szMsg),
"%s in function %s (%s:%u)\n\nDo you want to attempt to break into a debugger? Pressing Cancel will " "%s in function %s (%s:%u)\nDo you want to attempt to break into a debugger? Pressing Cancel will "
"abort the application.", "abort the application.",
szMessage, szFunction, szFile, uLine); szMessage, szFunction, szFile, uLine);
int result = MessageBoxA(NULL, szMsg, NULL, MB_OKCANCEL | MB_ICONERROR); int result = MessageBoxA(NULL, szMsg, NULL, MB_OKCANCEL | MB_ICONERROR);
if (result == IDOK) if (result == IDOK)
__debugbreak(); __debugbreak();
else
CrashHandler::WriteDumpForCaller();
TerminateProcess(GetCurrentProcess(), 0xBAADC0DE); TerminateProcess(GetCurrentProcess(), 0xBAADC0DE);
#else #else
fputs(szMsg, stderr); std::fputs(szMsg, stderr);
fputs("\nAborting application.\n", stderr); CrashHandler::WriteDumpForCaller();
fflush(stderr); std::fputs("Aborting application.\n", stderr);
abort(); std::fflush(stderr);
std::abort();
#endif #endif
ResumeThreads(pHandle); ResumeThreads(pHandle);