aboutsummaryrefslogtreecommitdiff
path: root/NorthstarDLL
diff options
context:
space:
mode:
authorEmma Miler <emma.pi@protonmail.com>2022-11-15 00:47:32 +0100
committerGitHub <noreply@github.com>2022-11-15 00:47:32 +0100
commit5cd63250b697f0b49ff1bb787672cf06bbce27a6 (patch)
treee3e1f1cee713079bdd6f392ae9ee04a731d8f535 /NorthstarDLL
parent0c6d1f4e79d31de6fde4979a72afacdd6d13ca60 (diff)
downloadNorthstarLauncher-5cd63250b697f0b49ff1bb787672cf06bbce27a6.tar.gz
NorthstarLauncher-5cd63250b697f0b49ff1bb787672cf06bbce27a6.zip
Fix slow keyvalues building (#331)
* Fix slow keyvalues building * Update crashhandler.cpp * Fix it
Diffstat (limited to 'NorthstarDLL')
-rw-r--r--NorthstarDLL/crashhandler.cpp56
-rw-r--r--NorthstarDLL/crashhandler.h4
2 files changed, 38 insertions, 22 deletions
diff --git a/NorthstarDLL/crashhandler.cpp b/NorthstarDLL/crashhandler.cpp
index 2532afd0..be09f870 100644
--- a/NorthstarDLL/crashhandler.cpp
+++ b/NorthstarDLL/crashhandler.cpp
@@ -31,12 +31,15 @@ void PrintExceptionLog(ExceptionLog& exc)
// General crash message
spdlog::error("Northstar version: {}", version);
spdlog::error("Northstar has crashed! a minidump has been written and exception info is available below:");
- spdlog::error("Loaded mods: ");
- for (const auto& mod : g_pModManager->m_LoadedMods)
+ if (g_pModManager)
{
- if (mod.m_bEnabled)
+ spdlog::error("Loaded mods: ");
+ for (const auto& mod : g_pModManager->m_LoadedMods)
{
- spdlog::error("{} {}", mod.Name, mod.Version);
+ if (mod.m_bEnabled)
+ {
+ spdlog::error("{} {}", mod.Name, mod.Version);
+ }
}
}
spdlog::error(exc.cause);
@@ -73,15 +76,15 @@ void PrintExceptionLog(ExceptionLog& exc)
std::string GetExceptionName(ExceptionLog& exc)
{
- const DWORD exceptionCode = exc.exceptionRecord->ExceptionCode;
+ const DWORD exceptionCode = exc.exceptionRecord.ExceptionCode;
auto name = ExceptionNames[exceptionCode];
if (exceptionCode == EXCEPTION_ACCESS_VIOLATION || exceptionCode == EXCEPTION_IN_PAGE_ERROR)
{
std::stringstream returnString;
returnString << name << ": ";
- auto exceptionInfo0 = exc.exceptionRecord->ExceptionInformation[0];
- auto exceptionInfo1 = exc.exceptionRecord->ExceptionInformation[1];
+ auto exceptionInfo0 = exc.exceptionRecord.ExceptionInformation[0];
+ auto exceptionInfo1 = exc.exceptionRecord.ExceptionInformation[1];
if (!exceptionInfo0)
returnString << "Attempted to read from: 0x" << (void*)exceptionInfo1;
@@ -130,7 +133,7 @@ void GenerateTrace(ExceptionLog& exc, bool skipErrorHandlingFrames = true, int n
GetModuleFileNameExA(GetCurrentProcess(), exc.crashedModule, crashedModuleFullName, MAX_PATH);
char* crashedModuleName = strrchr(crashedModuleFullName, '\\') + 1;
- DWORD64 crashedModuleOffset = ((DWORD64)exc.exceptionRecord->ExceptionAddress) - ((DWORD64)crashedModuleInfo.lpBaseOfDll);
+ DWORD64 crashedModuleOffset = ((DWORD64)exc.exceptionRecord.ExceptionAddress) - ((DWORD64)crashedModuleInfo.lpBaseOfDll);
PVOID framesToCapture[62];
int frames = RtlCaptureStackBackTrace(0, 62, framesToCapture, NULL);
@@ -182,7 +185,7 @@ void GenerateTrace(ExceptionLog& exc, bool skipErrorHandlingFrames = true, int n
exc.trace.push_back(BacktraceModule {s_moduleName, s_relativeAddress, fmt::format("{}", actualAddress)});
}
- CONTEXT* exceptionContext = exc.contextRecord;
+ CONTEXT* exceptionContext = &exc.contextRecord;
exc.registerDump.push_back(fmt::format("Flags: 0b{0:b}", exceptionContext->ContextFlags));
exc.registerDump.push_back(fmt::format("RIP: 0x{0:x}", exceptionContext->Rip));
@@ -259,33 +262,32 @@ void CreateMiniDump(EXCEPTION_POINTERS* exceptionInfo)
long GenerateExceptionLog(EXCEPTION_POINTERS* exceptionInfo)
{
+ storedException->exceptionRecord = *exceptionInfo->ExceptionRecord;
+ storedException->contextRecord = *exceptionInfo->ContextRecord;
const DWORD exceptionCode = exceptionInfo->ExceptionRecord->ExceptionCode;
void* exceptionAddress = exceptionInfo->ExceptionRecord->ExceptionAddress;
- auto exc = std::make_shared<ExceptionLog>();
- exc->exceptionRecord = exceptionInfo->ExceptionRecord;
- exc->contextRecord = exceptionInfo->ContextRecord;
- exc->cause = GetExceptionName(*exc);
+ storedException->cause = GetExceptionName(*storedException);
HMODULE crashedModuleHandle;
GetModuleHandleExA(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, static_cast<LPCSTR>(exceptionAddress), &crashedModuleHandle);
- exc->crashedModule = crashedModuleHandle;
+ storedException->crashedModule = crashedModuleHandle;
// When encountering a runtime exception, we store the exception to be displayed later
// We then have to return EXCEPTION_CONTINUE_SEARCH so that our runtime handler may be called
// This might possibly cause some issues if client and server are crashing at the same time, but honestly i don't care
if (exceptionCode == RUNTIME_EXCEPTION)
{
- GenerateTrace(*exc, false, 2);
- storedException = exc;
+ GenerateTrace(*storedException, false, 2);
+ storedException = storedException;
return EXCEPTION_CONTINUE_SEARCH;
}
- GenerateTrace(*exc, true, 0);
+ GenerateTrace(*storedException, true, 0);
CreateMiniDump(exceptionInfo);
- PrintExceptionLog(*exc);
+ PrintExceptionLog(*storedException);
return EXCEPTION_EXECUTE_HANDLER;
}
@@ -296,8 +298,17 @@ long __stdcall ExceptionFilter(EXCEPTION_POINTERS* exceptionInfo)
// Check if we are capable of handling this type of exception
if (ExceptionNames.find(exceptionInfo->ExceptionRecord->ExceptionCode) == ExceptionNames.end())
return EXCEPTION_CONTINUE_SEARCH;
- CreateMiniDump(exceptionInfo);
- return GenerateExceptionLog(exceptionInfo);
+ if (exceptionInfo->ExceptionRecord->ExceptionCode == RUNTIME_EXCEPTION)
+ {
+ storedException = std::make_shared<ExceptionLog>();
+ storedException->exceptionRecord = *exceptionInfo->ExceptionRecord;
+ storedException->contextRecord = *exceptionInfo->ContextRecord;
+ }
+ else
+ {
+ CreateMiniDump(exceptionInfo);
+ return GenerateExceptionLog(exceptionInfo);
+ }
}
return EXCEPTION_EXECUTE_HANDLER;
@@ -321,6 +332,11 @@ void RuntimeExceptionHandler()
{
storedException->runtimeInfo = "Unknown runtime exception type";
}
+ EXCEPTION_POINTERS test {};
+ test.ContextRecord = &storedException->contextRecord;
+ test.ExceptionRecord = &storedException->exceptionRecord;
+ CreateMiniDump(&test);
+ GenerateExceptionLog(&test);
PrintExceptionLog(*storedException);
exit(-1);
}
diff --git a/NorthstarDLL/crashhandler.h b/NorthstarDLL/crashhandler.h
index 990457cc..4d8a59ce 100644
--- a/NorthstarDLL/crashhandler.h
+++ b/NorthstarDLL/crashhandler.h
@@ -14,8 +14,8 @@ struct ExceptionLog
{
std::string cause;
HMODULE crashedModule;
- PEXCEPTION_RECORD exceptionRecord;
- PCONTEXT contextRecord;
+ EXCEPTION_RECORD exceptionRecord;
+ CONTEXT contextRecord;
std::vector<BacktraceModule> trace;
std::vector<std::string> registerDump;