Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[SharedCache] Cache references to type libraries #6195

Closed
wants to merge 1 commit into from
Closed

[SharedCache] Cache references to type libraries #6195

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 44 additions & 20 deletions view/sharedcache/core/SharedCache.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,11 +83,18 @@ std::unordered_map<uint64_t, BNDSCViewLoadProgress> progressMap;

struct ViewSpecificMutexes {
std::mutex viewOperationsThatInfluenceMetadataMutex;
std::mutex typeLibraryLookupAndApplicationMutex;
};

static std::unordered_map<uint64_t, ViewSpecificMutexes> viewSpecificMutexes;

// TODO: I believe this leaks memory due to no cleanup when a view is closed
struct ViewSpecificCaches {
std::map<std::string, Ref<TypeLibrary>> typeLibraryCache;
std::mutex typeLibraryCacheMutex;
};

static std::unordered_map<uint64_t, ViewSpecificCaches> viewSpecificCaches;


std::string base_name(std::string const& path)
{
Expand Down Expand Up @@ -1785,21 +1792,27 @@ bool SharedCache::LoadImageWithInstallName(std::string installName)
return false;
}

std::unique_lock<std::mutex> typelibLock(viewSpecificMutexes[m_dscView->GetFile()->GetSessionId()].typeLibraryLookupAndApplicationMutex);
auto typeLib = m_dscView->GetTypeLibrary(header.installName);

if (!typeLib)
Ref<TypeLibrary> typeLib;
std::unique_lock<std::mutex> typeLibraryCacheLock(viewSpecificCaches[m_dscView->GetFile()->GetSessionId()].typeLibraryCacheMutex);
auto typeLibraryCache = viewSpecificCaches[m_dscView->GetFile()->GetSessionId()].typeLibraryCache;
if (auto it = typeLibraryCache.find(header.installName); it != typeLibraryCache.end()) {
typeLib = it->second;
}
else
{
auto typeLibs = m_dscView->GetDefaultPlatform()->GetTypeLibrariesByName(header.installName);
if (!typeLibs.empty())
typeLib = m_dscView->GetTypeLibrary(header.installName);
if (!typeLib)
{
typeLib = typeLibs[0];
m_dscView->AddTypeLibrary(typeLib);
m_logger->LogInfo("shared-cache: adding type library for '%s': %s (%s)",
targetImage->installName.c_str(), typeLib->GetName().c_str(), typeLib->GetGuid().c_str());
auto typeLibs = m_dscView->GetDefaultPlatform()->GetTypeLibrariesByName(header.installName);
if (!typeLibs.empty())
{
typeLib = typeLibs[0];
typeLibraryCache[header.installName] = typeLib;
m_dscView->AddTypeLibrary(typeLib);
}
}
}
typelibLock.unlock();
typeLibraryCacheLock.unlock();

SaveToDSCView();

Expand Down Expand Up @@ -2885,18 +2898,29 @@ void SharedCache::FindSymbolAtAddrAndApplyToAddr(uint64_t symbolLocation, uint64
}
auto exportList = SharedCache::ParseExportTrie(mapping, *header);
std::vector<std::pair<uint64_t, std::pair<BNSymbolType, std::string>>> exportMapping;
std::unique_lock<std::mutex> lock(viewSpecificMutexes[m_dscView->GetFile()->GetSessionId()].typeLibraryLookupAndApplicationMutex);
auto typeLib = m_dscView->GetTypeLibrary(header->installName);
if (!typeLib)

Ref<TypeLibrary> typeLib;
std::unique_lock<std::mutex> typeLibraryCacheLock(viewSpecificCaches[m_dscView->GetFile()->GetSessionId()].typeLibraryCacheMutex);
auto typeLibraryCache = viewSpecificCaches[m_dscView->GetFile()->GetSessionId()].typeLibraryCache;
if (auto it = typeLibraryCache.find(header->installName); it != typeLibraryCache.end()) {
typeLib = it->second;
}
else
{
auto typeLibs = m_dscView->GetDefaultPlatform()->GetTypeLibrariesByName(header->installName);
if (!typeLibs.empty())
typeLib = m_dscView->GetTypeLibrary(header->installName);
if (!typeLib)
{
typeLib = typeLibs[0];
m_dscView->AddTypeLibrary(typeLib);
auto typeLibs = m_dscView->GetDefaultPlatform()->GetTypeLibrariesByName(header->installName);
if (!typeLibs.empty())
{
typeLib = typeLibs[0];
typeLibraryCache[header->installName] = typeLib;
m_dscView->AddTypeLibrary(typeLib);
}
}
}
lock.unlock();
typeLibraryCacheLock.unlock();

id = m_dscView->BeginUndoActions();
m_dscView->BeginBulkModifySymbols();
for (const auto& sym : exportList)
Expand Down