RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 02:07:35 +00:00
Code Issues Activity Actions

SymbolServer: Resolve filenames and line numbers from debug info :^)

Browse source 
This makes symbolication take a little longer the first time we load a
shared library, but then the cache keeps it warm.
This commit is contained in:
Andreas Kling 2021-02-05 00:23:58 +01:00
parent 72f96941f2
commit a4e087e685
2 changed files with 16 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Userland/Services/SymbolServer/CMakeLists.txt
View file

@ -9,4 +9,4 @@ set(SOURCES
) )
serenity_bin(SymbolServer) serenity_bin(SymbolServer)
target_link_libraries(SymbolServer LibIPC) target_link_libraries(SymbolServer LibIPC LibDebug)

21
Userland/Services/SymbolServer/ClientConnection.cpp
View file

@ -25,6 +25,7 @@
*/ */
#include <AK/MappedFile.h> #include <AK/MappedFile.h>
#include <LibDebug/DebugInfo.h>
#include <LibELF/Image.h> #include <LibELF/Image.h>
#include <SymbolServer/ClientConnection.h> #include <SymbolServer/ClientConnection.h>
#include <SymbolServer/SymbolClientEndpoint.h> #include <SymbolServer/SymbolClientEndpoint.h>
@ -33,7 +34,7 @@ namespace SymbolServer {
struct CachedELF { struct CachedELF {
NonnullRefPtr<MappedFile> mapped_file; NonnullRefPtr<MappedFile> mapped_file;
ELF::Image elf; Debug::DebugInfo debug_info;
}; };
static HashMap<String, OwnPtr<CachedELF>> s_cache; static HashMap<String, OwnPtr<CachedELF>> s_cache;
@ -69,13 +70,14 @@ OwnPtr<Messages::SymbolServer::SymbolicateResponse> ClientConnection::handle(con
s_cache.set(path, {}); s_cache.set(path, {});
return make<Messages::SymbolServer::SymbolicateResponse>(false, String {}, 0, String {}, 0); return make<Messages::SymbolServer::SymbolicateResponse>(false, String {}, 0, String {}, 0);
} }
auto elf = ELF::Image(mapped_file.value()->bytes()); auto elf = make<ELF::Image>(mapped_file.value()->bytes());
if (!elf.is_valid()) { if (!elf->is_valid()) {
dbgln("ELF not valid: {}", path); dbgln("ELF not valid: {}", path);
s_cache.set(path, {}); s_cache.set(path, {});
return make<Messages::SymbolServer::SymbolicateResponse>(false, String {}, 0, String {}, 0); return make<Messages::SymbolServer::SymbolicateResponse>(false, String {}, 0, String {}, 0);
} }
auto cached_elf = make<CachedELF>(mapped_file.release_value(), move(elf)); Debug::DebugInfo debug_info(move(elf));
auto cached_elf = make<CachedELF>(mapped_file.release_value(), move(debug_info));
s_cache.set(path, move(cached_elf)); s_cache.set(path, move(cached_elf));
} }
@ -87,9 +89,16 @@ OwnPtr<Messages::SymbolServer::SymbolicateResponse> ClientConnection::handle(con
return make<Messages::SymbolServer::SymbolicateResponse>(false, String {}, 0, String {}, 0); return make<Messages::SymbolServer::SymbolicateResponse>(false, String {}, 0, String {}, 0);
u32 offset = 0; u32 offset = 0;
auto symbol = cached_elf->elf.symbolicate(message.address(), &offset); auto symbol = cached_elf->debug_info.elf().symbolicate(message.address(), &offset);
auto source_position = cached_elf->debug_info.get_source_position(message.address());
String filename;
u32 line_number = 0;
if (source_position.has_value()) {
filename = source_position.value().file_path;
line_number = source_position.value().line_number;
}
return make<Messages::SymbolServer::SymbolicateResponse>(true, symbol, offset, String {}, 0); return make<Messages::SymbolServer::SymbolicateResponse>(true, symbol, offset, filename, line_number);
} }
} }