From b74c500aa9e5e7949ca46f42e0dc62e02136e259 Mon Sep 17 00:00:00 2001 From: Mason Reed Date: Mon, 14 Apr 2025 01:53:06 -0400 Subject: [SharedCache] Misc cleanup - Make `SharedCache::m_entries` a simple std::vector we never lookup based off the entry ID - Remove some old comments - Rename some old variables so that they are accurate - Fix compiler warnings - Remove some unneeded copying --- view/sharedcache/core/SharedCacheController.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'view/sharedcache/core/SharedCacheController.cpp') diff --git a/view/sharedcache/core/SharedCacheController.cpp b/view/sharedcache/core/SharedCacheController.cpp index b6dfdb47..e0cd036f 100644 --- a/view/sharedcache/core/SharedCacheController.cpp +++ b/view/sharedcache/core/SharedCacheController.cpp @@ -66,17 +66,17 @@ DSCRef SharedCacheController::Initialize(BinaryView& view auto id = GetViewIdFromView(view); std::unique_lock lock(GlobalControllersMutex); auto logger = new Logger("SharedCache.Controller", view.GetFile()->GetSessionId()); - DSCRef dscView = new SharedCacheController(std::move(cache), logger); + DSCRef controller = new SharedCacheController(std::move(cache), logger); // Pull the settings from the view. if (Ref settings = view.GetLoadSettings(VIEW_NAME)) { if (settings->Contains("loader.dsc.processObjC")) - dscView->m_processObjC = settings->Get("loader.dsc.processObjC", &view); + controller->m_processObjC = settings->Get("loader.dsc.processObjC", &view); if (settings->Contains("loader.dsc.processCFStrings")) - dscView->m_processCFStrings = settings->Get("loader.dsc.processCFStrings", &view); + controller->m_processCFStrings = settings->Get("loader.dsc.processCFStrings", &view); if (settings->Contains("loader.dsc.regionFilter")) - dscView->m_regionFilter = std::regex(settings->Get("loader.dsc.regionFilter", &view)); + controller->m_regionFilter = std::regex(settings->Get("loader.dsc.regionFilter", &view)); } // TODO: Support old shared cache metadata @@ -88,10 +88,10 @@ DSCRef SharedCacheController::Initialize(BinaryView& view // This effectively restores the state of the opened database to when it was last saved. // NOTE: We store on the parent view because hilariously, the metadata is not present until after view init. if (const auto metadata = view.GetParentView()->QueryMetadata(METADATA_KEY)) - dscView->LoadMetadata(*metadata); + controller->LoadMetadata(*metadata); - GlobalControllers().insert({id, dscView}); - return dscView; + GlobalControllers().insert({id, controller}); + return controller; } DSCRef SharedCacheController::FromView(BinaryView& view) -- cgit v1.3.1