RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 15:48:12 +00:00
Code Issues Activity Actions

SymbolServer+LibSymbolClient: Just do one symbol per IPC message

Browse source 
I originally wanted to batch the symbolication requests but that just
makes the client logic significantly more complicated with no real
benefit other than architectural feelgood points.
This commit is contained in:
Andreas Kling 2021-02-04 23:33:27 +01:00
parent 5dd555fe2f
commit acabc37c24
4 changed files with 22 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

32
Userland/Libraries/LibSymbolClient/Client.cpp
View file

@ -47,19 +47,19 @@ void Client::handle(const Messages::SymbolClient::Dummy&)
{
}
Vector<Symbol> Client::symbolicate(const String& path, const Vector<FlatPtr>& addresses)
Optional<Symbol> Client::symbolicate(const String& path, FlatPtr address)
{
auto response = send_sync<Messages::SymbolServer::Symbolicate>(path, addresses);
auto response = send_sync<Messages::SymbolServer::Symbolicate>(path, address);
if (!response->success())
return {};
Vector<Symbol> symbols;
for (auto& symbol : response->symbols()) {
Symbol s;
s.name = symbol;
symbols.append(move(s));
}
return symbols;
return Symbol {
.address = address,
.name = response->name(),
.offset = response->offset(),
.filename = response->filename(),
.line_number = response->line()
};
}
Vector<Symbol> symbolicate_thread(pid_t pid, pid_t tid)
@ -159,23 +159,21 @@ Vector<Symbol> symbolicate_thread(pid_t pid, pid_t tid)
continue;
}
Vector<FlatPtr> addresses;
FlatPtr adjusted_address;
if (found_region->is_relative)
addresses.append(address - found_region->base);
adjusted_address = address - found_region->base;
else
addresses.append(address);
adjusted_address = address;
auto result = client->symbolicate(found_region->path, addresses);
if (result.is_empty()) {
auto result = client->symbolicate(found_region->path, adjusted_address);
if (!result.has_value()) {
symbols.append(Symbol {
.address = address,
});
continue;
}
symbols.append(Symbol {
.address = address,
.name = result[0].name });
symbols.append(result.value());
}
return symbols;
}