evert/osb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve Windows stack output

Browse Source
This commit is contained in:
Kae 2024-08-04 21:22:50 +10:00
parent 9b3bf5ae82
commit cb547d0bc6
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
source/core/StarException_windows.cpp
View File

@ -10,6 +10,8 @@ namespace Star {
struct WindowsSymInitializer { struct WindowsSymInitializer {
WindowsSymInitializer() { WindowsSymInitializer() {
DWORD options = SymGetOptions();
SymSetOptions(options | SYMOPT_LOAD_LINES);
if (!SymInitialize(GetCurrentProcess(), NULL, TRUE)) if (!SymInitialize(GetCurrentProcess(), NULL, TRUE))
fatalError("SymInitialize failed", false); fatalError("SymInitialize failed", false);
} }
@ -126,9 +128,19 @@ OutputProxy outputStack(StackCapture stack) {
symbol->SizeOfStruct = sizeof(SYMBOL_INFO); symbol->SizeOfStruct = sizeof(SYMBOL_INFO);
symbol->MaxNameLen = MAX_SYM_NAME; symbol->MaxNameLen = MAX_SYM_NAME;
DWORD64 displacement = 0; format(os, "[{:0{}}] {}", i, (int)log10(stack.second) + 1, (void*)stack.first[i]);
format(os, "[{}] {}", i, (void*)stack.first[i]); IMAGEHLP_LINE64 line{};
if (SymFromAddr(process, stack.first[i], &displacement, symbol)) DWORD displacement = 0;
line.SizeOfStruct = sizeof(IMAGEHLP_LINE64);
if (SymGetLineFromAddr64(process, stack.first[i], &displacement, &line) && *line.FileName) {
char* file = line.FileName;
for (char* i = file; *i; ++i) {
if (*i == '\\' || *i == '/')
file = i;
}
format(os, " ({}:{})", ++file, line.LineNumber);
}
if (SymFromAddr(process, stack.first[i], NULL, symbol))
format(os, " {}", symbol->Name); format(os, " {}", symbol->Name);
if (i + 1 < stack.second) if (i + 1 < stack.second)