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

LibCoreDump: Change Backtrace debug info cache to member variable

Browse source 
This changes the previously static s_debug_info_cache to a member
variable. This is required so the cache is not kept alive if the
Backtrace object is destroyed.

Previously, the cache object would keep alive MappedFile objects and
other data, resulting in CrashReporter and CrashDaemon using more than
100 MB of memory even after the Backtrace objects have been destroyed
(and the data is thus no longer needed). This was especially the case
when handling crashes from Browser (due to libweb.so and libjs.so).

Due to this change, object_info_for_region has been promoted to a
instance method. It has also been cleaned up somewhat.
This commit is contained in:
Max Wipfli 2021-06-30 14:46:49 +02:00 • committed by Andreas Kling
parent fe2716df21
commit c1fbfdc164
2 changed files with 11 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Userland/Libraries/LibCoreDump/Backtrace.cpp
View file

@ -17,25 +17,17 @@
namespace CoreDump {
// FIXME: This cache has to be invalidated when libraries/programs are re-compiled.
// We can store the last-modified timestamp of the elf files in ELFObjectInfo to invalidate cache entries.
static HashMap<String, NonnullOwnPtr<ELFObjectInfo>> s_debug_info_cache;
static const ELFObjectInfo* object_info_for_region(const ELF::Core::MemoryRegionInfo& region)
ELFObjectInfo const* Backtrace::object_info_for_region(ELF::Core::MemoryRegionInfo const& region)
{
auto name = region.object_name();
auto path = region.object_name();
if (!path.starts_with('/') && path.ends_with(".so"sv))
path = LexicalPath::join("/usr/lib", path).string();
String path;
if (name.contains(".so"))
path = String::formatted("/usr/lib/{}", name);
else {
path = name;
}
auto maybe_ptr = m_debug_info_cache.get(path);
if (maybe_ptr.has_value())
return *maybe_ptr;
if (auto it = s_debug_info_cache.find(path); it != s_debug_info_cache.end())
return it->value.ptr();
if (!Core::File::exists(path.characters()))
if (!Core::File::exists(path))
return nullptr;
auto file_or_error = MappedFile::map(path);
@ -49,7 +41,7 @@ static const ELFObjectInfo* object_info_for_region(const ELF::Core::MemoryRegion
#endif
auto info = make<ELFObjectInfo>(file_or_error.release_value(), make<Debug::DebugInfo>(move(image)));
auto* info_ptr = info.ptr();
s_debug_info_cache.set(path, move(info));
m_debug_info_cache.set(path, move(info));
return info_ptr;
}