https://github.com/DmT021 updated
https://github.com/llvm/llvm-project/pull/110646
>From 64a4d69d1bb3f32c4b303d6f45b45cdf513183c2 Mon Sep 17 00:00:00 2001
From: Dmitrii Galimzianov <dmt...@gmail.com>
Date: Sun, 29 Sep 2024 22:24:19 +0200
Subject: [PATCH 1/2] DynamicLoaderDarwin load images in parallel
---
.../DynamicLoader/MacOSX-DYLD/CMakeLists.txt | 13 ++++
.../MacOSX-DYLD/DynamicLoaderDarwin.cpp | 71 +++++++++++++++++--
.../MacOSX-DYLD/DynamicLoaderDarwin.h | 4 +-
.../DynamicLoaderDarwinProperties.cpp | 53 ++++++++++++++
.../DynamicLoaderDarwinProperties.h | 34 +++++++++
.../DynamicLoaderDarwinProperties.td | 8 +++
.../MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp | 8 ++-
.../MacOSX-DYLD/DynamicLoaderMacOSXDYLD.h | 2 +
8 files changed, 185 insertions(+), 8 deletions(-)
create mode 100644
lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderDarwinProperties.cpp
create mode 100644
lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderDarwinProperties.h
create mode 100644
lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderDarwinProperties.td
diff --git a/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/CMakeLists.txt
b/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/CMakeLists.txt
index 7308374c8bfba6..77a560541fcb1f 100644
--- a/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/CMakeLists.txt
+++ b/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/CMakeLists.txt
@@ -1,7 +1,16 @@
+lldb_tablegen(DynamicLoaderDarwinProperties.inc -gen-lldb-property-defs
+ SOURCE DynamicLoaderDarwinProperties.td
+ TARGET LLDBPluginDynamicLoaderDarwinPropertiesGen)
+
+lldb_tablegen(DynamicLoaderDarwinPropertiesEnum.inc
-gen-lldb-property-enum-defs
+ SOURCE DynamicLoaderDarwinProperties.td
+ TARGET LLDBPluginDynamicLoaderDarwinPropertiesEnumGen)
+
add_lldb_library(lldbPluginDynamicLoaderMacOSXDYLD PLUGIN
DynamicLoaderMacOSXDYLD.cpp
DynamicLoaderMacOS.cpp
DynamicLoaderDarwin.cpp
+ DynamicLoaderDarwinProperties.cpp
LINK_LIBS
lldbBreakpoint
@@ -16,3 +25,7 @@ add_lldb_library(lldbPluginDynamicLoaderMacOSXDYLD PLUGIN
Support
TargetParser
)
+
+add_dependencies(lldbPluginDynamicLoaderMacOSXDYLD
+ LLDBPluginDynamicLoaderDarwinPropertiesGen
+ LLDBPluginDynamicLoaderDarwinPropertiesEnumGen)
diff --git
a/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderDarwin.cpp
b/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderDarwin.cpp
index 30242038a5f66f..3d57a10a196c11 100644
--- a/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderDarwin.cpp
+++ b/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderDarwin.cpp
@@ -8,6 +8,7 @@
#include "DynamicLoaderDarwin.h"
+#include "DynamicLoaderDarwinProperties.h"
#include "lldb/Breakpoint/StoppointCallbackContext.h"
#include "lldb/Core/Debugger.h"
#include "lldb/Core/Module.h"
@@ -31,6 +32,7 @@
#include "lldb/Utility/LLDBLog.h"
#include "lldb/Utility/Log.h"
#include "lldb/Utility/State.h"
+#include "llvm/Support/ThreadPool.h"
#include "Plugins/LanguageRuntime/ObjC/ObjCLanguageRuntime.h"
#include "Plugins/TypeSystem/Clang/TypeSystemClang.h"
@@ -77,6 +79,17 @@ void DynamicLoaderDarwin::DidLaunch() {
SetNotificationBreakpoint();
}
+void DynamicLoaderDarwin::CreateSettings(lldb_private::Debugger &debugger) {
+ if (!PluginManager::GetSettingForDynamicLoaderPlugin(
+ debugger, DynamicLoaderDarwinProperties::GetSettingName())) {
+ const bool is_global_setting = true;
+ PluginManager::CreateSettingForDynamicLoaderPlugin(
+ debugger,
+ DynamicLoaderDarwinProperties::GetGlobal().GetValueProperties(),
+ "Properties for the DynamicLoaderDarwin plug-in.", is_global_setting);
+ }
+}
+
// Clear out the state of this class.
void DynamicLoaderDarwin::Clear(bool clear_process) {
std::lock_guard<std::recursive_mutex> guard(m_mutex);
@@ -88,7 +101,7 @@ void DynamicLoaderDarwin::Clear(bool clear_process) {
}
ModuleSP DynamicLoaderDarwin::FindTargetModuleForImageInfo(
- ImageInfo &image_info, bool can_create, bool *did_create_ptr) {
+ const ImageInfo &image_info, bool can_create, bool *did_create_ptr) {
if (did_create_ptr)
*did_create_ptr = false;
@@ -642,6 +655,41 @@ ModuleSP DynamicLoaderDarwin::GetDYLDModule() {
void DynamicLoaderDarwin::ClearDYLDModule() { m_dyld_module_wp.reset(); }
+template <typename InputIterator, typename ResultType>
+static std::vector<ResultType> parallel_map(
+ llvm::ThreadPoolInterface &threadPool, InputIterator first,
+ InputIterator last,
+ llvm::function_ref<ResultType(
+ const typename std::iterator_traits<InputIterator>::value_type &)>
+ transform) {
+ const auto size = std::distance(first, last);
+ std::vector<ResultType> results(size);
+ if (size > 0) {
+ llvm::ThreadPoolTaskGroup taskGroup(threadPool);
+ auto it = first;
+ for (ssize_t i = 0; i < size; ++i, ++it) {
+ taskGroup.async([&, i, it]() { results[i] = transform(*it); });
+ }
+ taskGroup.wait();
+ }
+ return results;
+}
+
+template <typename InputIterator, typename ResultType>
+static std::vector<ResultType>
+map(InputIterator first, InputIterator last,
+ llvm::function_ref<ResultType(
+ const typename std::iterator_traits<InputIterator>::value_type &)>
+ transform) {
+ const auto size = std::distance(first, last);
+ std::vector<ResultType> results(size);
+ auto it = first;
+ for (ssize_t i = 0; i < size; ++i, ++it) {
+ results[i] = transform(*it);
+ }
+ return results;
+}
+
bool DynamicLoaderDarwin::AddModulesUsingImageInfos(
ImageInfo::collection &image_infos) {
std::lock_guard<std::recursive_mutex> guard(m_mutex);
@@ -651,17 +699,28 @@ bool DynamicLoaderDarwin::AddModulesUsingImageInfos(
Target &target = m_process->GetTarget();
ModuleList &target_images = target.GetImages();
- for (uint32_t idx = 0; idx < image_infos.size(); ++idx) {
+ auto ImageLoad = [this, log](const ImageInfo &image_info) {
if (log) {
LLDB_LOGF(log, "Adding new image at address=0x%16.16" PRIx64 ".",
- image_infos[idx].address);
- image_infos[idx].PutToLog(log);
+ image_info.address);
+ image_info.PutToLog(log);
}
+ return FindTargetModuleForImageInfo(image_info, true, nullptr);
+ };
+ bool is_parallel_load =
+ DynamicLoaderDarwinProperties::GetGlobal().GetEnableParallelImageLoad();
+ auto images =
+ is_parallel_load
+ ? parallel_map<ImageInfo::collection::const_iterator, ModuleSP>(
+ Debugger::GetThreadPool(), image_infos.begin(),
+ image_infos.end(), ImageLoad)
+ : map<ImageInfo::collection::const_iterator, ModuleSP>(
+ image_infos.begin(), image_infos.end(), ImageLoad);
+ for (uint32_t idx = 0; idx < image_infos.size(); ++idx) {
m_dyld_image_infos.push_back(image_infos[idx]);
- ModuleSP image_module_sp(
- FindTargetModuleForImageInfo(image_infos[idx], true, nullptr));
+ ModuleSP image_module_sp = images[idx];
if (image_module_sp) {
ObjectFile *objfile = image_module_sp->GetObjectFile();
diff --git
a/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderDarwin.h
b/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderDarwin.h
index 45c693163f8105..b70a2da3cc95a9 100644
--- a/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderDarwin.h
+++ b/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderDarwin.h
@@ -58,6 +58,8 @@ class DynamicLoaderDarwin : public
lldb_private::DynamicLoader {
std::optional<lldb_private::Address> GetStartAddress() override;
+ static void CreateSettings(lldb_private::Debugger &debugger);
+
protected:
void PrivateInitialize(lldb_private::Process *process);
@@ -174,7 +176,7 @@ class DynamicLoaderDarwin : public
lldb_private::DynamicLoader {
bool UnloadModuleSections(lldb_private::Module *module, ImageInfo &info);
- lldb::ModuleSP FindTargetModuleForImageInfo(ImageInfo &image_info,
+ lldb::ModuleSP FindTargetModuleForImageInfo(const ImageInfo &image_info,
bool can_create,
bool *did_create_ptr);
diff --git
a/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderDarwinProperties.cpp
b/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderDarwinProperties.cpp
new file mode 100644
index 00000000000000..f4d8a071e6d5de
--- /dev/null
+++
b/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderDarwinProperties.cpp
@@ -0,0 +1,53 @@
+//===-- DynamicLoaderDarwinProperties.cpp
---------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM
Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#include "DynamicLoaderDarwinProperties.h"
+
+using namespace lldb_private;
+
+#define LLDB_PROPERTIES_dynamicloaderdarwin_experimental
+#include "DynamicLoaderDarwinProperties.inc"
+
+enum {
+#define LLDB_PROPERTIES_dynamicloaderdarwin_experimental
+#include "DynamicLoaderDarwinPropertiesEnum.inc"
+};
+
+llvm::StringRef DynamicLoaderDarwinProperties::GetSettingName() {
+ static constexpr llvm::StringLiteral g_setting_name("darwin");
+ return g_setting_name;
+}
+
+DynamicLoaderDarwinProperties::ExperimentalProperties::ExperimentalProperties()
+ : Properties(std::make_shared<OptionValueProperties>(
+ GetExperimentalSettingsName())) {
+ m_collection_sp->Initialize(g_dynamicloaderdarwin_experimental_properties);
+}
+
+DynamicLoaderDarwinProperties::DynamicLoaderDarwinProperties()
+ : Properties(std::make_shared<OptionValueProperties>(GetSettingName())),
+ m_experimental_properties(std::make_unique<ExperimentalProperties>()) {
+ m_collection_sp->AppendProperty(
+ Properties::GetExperimentalSettingsName(),
+ "Experimental settings - setting these won't produce errors if the "
+ "setting is not present.",
+ true, m_experimental_properties->GetValueProperties());
+}
+
+bool DynamicLoaderDarwinProperties::GetEnableParallelImageLoad() const {
+ return m_experimental_properties->GetPropertyAtIndexAs<bool>(
+ ePropertyEnableParallelImageLoad,
+ g_dynamicloaderdarwin_experimental_properties
+ [ePropertyEnableParallelImageLoad]
+ .default_uint_value != 0);
+}
+
+DynamicLoaderDarwinProperties &DynamicLoaderDarwinProperties::GetGlobal() {
+ static DynamicLoaderDarwinProperties g_settings;
+ return g_settings;
+}
diff --git
a/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderDarwinProperties.h
b/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderDarwinProperties.h
new file mode 100644
index 00000000000000..4c5e800c4f3e4c
--- /dev/null
+++
b/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderDarwinProperties.h
@@ -0,0 +1,34 @@
+//===-- DynamicLoaderDarwinProperties.h -------------------------*- C++
-*-===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM
Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef
LLDB_SOURCE_PLUGINS_DYNAMICLOADER_MACOSX_DYLD_DYNAMICLOADERDARWINPROPERTIES_H
+#define
LLDB_SOURCE_PLUGINS_DYNAMICLOADER_MACOSX_DYLD_DYNAMICLOADERDARWINPROPERTIES_H
+
+#include "lldb/Core/UserSettingsController.h"
+
+namespace lldb_private {
+
+class DynamicLoaderDarwinProperties : public Properties {
+public:
+ class ExperimentalProperties : public Properties {
+ public:
+ ExperimentalProperties();
+ };
+ static llvm::StringRef GetSettingName();
+ static DynamicLoaderDarwinProperties &GetGlobal();
+ DynamicLoaderDarwinProperties();
+ ~DynamicLoaderDarwinProperties() override = default;
+ bool GetEnableParallelImageLoad() const;
+
+private:
+ std::unique_ptr<ExperimentalProperties> m_experimental_properties;
+};
+
+} // namespace lldb_private
+
+#endif //
LLDB_SOURCE_PLUGINS_DYNAMICLOADER_MACOSX_DYLD_DYNAMICLOADERDARWINPROPERTIES_H
diff --git
a/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderDarwinProperties.td
b/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderDarwinProperties.td
new file mode 100644
index 00000000000000..c54580ce347296
--- /dev/null
+++
b/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderDarwinProperties.td
@@ -0,0 +1,8 @@
+include "../../../../include/lldb/Core/PropertiesBase.td"
+
+let Definition = "dynamicloaderdarwin_experimental" in {
+ def EnableParallelImageLoad: Property<"enable-parallel-image-load",
"Boolean">,
+ Global,
+ DefaultTrue,
+ Desc<"Load images in parallel.">;
+}
diff --git
a/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp
b/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp
index debd0f6ee83f40..0da565abb8a0f7 100644
--- a/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp
+++ b/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp
@@ -1147,7 +1147,8 @@ bool DynamicLoaderMacOSXDYLD::IsFullyInitialized() {
void DynamicLoaderMacOSXDYLD::Initialize() {
PluginManager::RegisterPlugin(GetPluginNameStatic(),
- GetPluginDescriptionStatic(), CreateInstance);
+ GetPluginDescriptionStatic(), CreateInstance,
+ DebuggerInitialize);
DynamicLoaderMacOS::Initialize();
}
@@ -1156,6 +1157,11 @@ void DynamicLoaderMacOSXDYLD::Terminate() {
PluginManager::UnregisterPlugin(CreateInstance);
}
+void DynamicLoaderMacOSXDYLD::DebuggerInitialize(
+ lldb_private::Debugger &debugger) {
+ CreateSettings(debugger);
+}
+
llvm::StringRef DynamicLoaderMacOSXDYLD::GetPluginDescriptionStatic() {
return "Dynamic loader plug-in that watches for shared library loads/unloads
"
"in MacOSX user processes.";
diff --git
a/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.h
b/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.h
index ae7451722a8d75..924e2fc107743c 100644
--- a/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.h
+++ b/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.h
@@ -50,6 +50,8 @@ class DynamicLoaderMacOSXDYLD : public
lldb_private::DynamicLoaderDarwin {
static lldb_private::DynamicLoader *
CreateInstance(lldb_private::Process *process, bool force);
+ static void DebuggerInitialize(lldb_private::Debugger &debugger);
+
/// Called after attaching a process.
///
/// Allow DynamicLoader plug-ins to execute some code after
>From c8f133bc57a5c233e4c320bd0e60c359e20fe030 Mon Sep 17 00:00:00 2001
From: Dmitrii Galimzianov <dmt...@gmail.com>
Date: Tue, 1 Oct 2024 11:12:45 +0200
Subject: [PATCH 2/2] DoInitialImageFetch routine preloads modules explicitly
---
.../MacOSX-DYLD/DynamicLoaderDarwin.cpp | 87 +++++++++++--------
.../MacOSX-DYLD/DynamicLoaderDarwin.h | 19 ++--
.../MacOSX-DYLD/DynamicLoaderMacOS.cpp | 10 ++-
.../MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp | 5 +-
4 files changed, 72 insertions(+), 49 deletions(-)
diff --git
a/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderDarwin.cpp
b/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderDarwin.cpp
index 3d57a10a196c11..c6a59d9e87a46b 100644
--- a/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderDarwin.cpp
+++ b/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderDarwin.cpp
@@ -530,8 +530,8 @@ bool DynamicLoaderDarwin::JSONImageInformationIntoImageInfo(
return true;
}
-void DynamicLoaderDarwin::UpdateSpecialBinariesFromNewImageInfos(
- ImageInfo::collection &image_infos) {
+void DynamicLoaderDarwin::UpdateSpecialBinariesFromPreloadedModules(
+ std::vector<std::pair<ImageInfo, ModuleSP>> &images) {
uint32_t exe_idx = UINT32_MAX;
uint32_t dyld_idx = UINT32_MAX;
Target &target = m_process->GetTarget();
@@ -539,35 +539,34 @@ void
DynamicLoaderDarwin::UpdateSpecialBinariesFromNewImageInfos(
ConstString g_dyld_sim_filename("dyld_sim");
ArchSpec target_arch = target.GetArchitecture();
- const size_t image_infos_size = image_infos.size();
- for (size_t i = 0; i < image_infos_size; i++) {
- if (image_infos[i].header.filetype == llvm::MachO::MH_DYLINKER) {
+ const size_t images_size = images.size();
+ for (size_t i = 0; i < images_size; i++) {
+ const auto &image_info = images[i].first;
+ if (image_info.header.filetype == llvm::MachO::MH_DYLINKER) {
// In a "simulator" process we will have two dyld modules --
// a "dyld" that we want to keep track of, and a "dyld_sim" which
// we don't need to keep track of here. dyld_sim will have a non-macosx
// OS.
if (target_arch.GetTriple().getEnvironment() == llvm::Triple::Simulator
&&
- image_infos[i].os_type != llvm::Triple::OSType::MacOSX) {
+ image_info.os_type != llvm::Triple::OSType::MacOSX) {
continue;
}
dyld_idx = i;
}
- if (image_infos[i].header.filetype == llvm::MachO::MH_EXECUTE) {
+ if (image_info.header.filetype == llvm::MachO::MH_EXECUTE) {
exe_idx = i;
}
}
// Set the target executable if we haven't found one so far.
if (exe_idx != UINT32_MAX && !target.GetExecutableModule()) {
- const bool can_create = true;
- ModuleSP exe_module_sp(FindTargetModuleForImageInfo(image_infos[exe_idx],
- can_create, nullptr));
+ ModuleSP exe_module_sp = images[exe_idx].second;
if (exe_module_sp) {
LLDB_LOGF(log, "Found executable module: %s",
exe_module_sp->GetFileSpec().GetPath().c_str());
target.GetImages().AppendIfNeeded(exe_module_sp);
- UpdateImageLoadAddress(exe_module_sp.get(), image_infos[exe_idx]);
+ UpdateImageLoadAddress(exe_module_sp.get(), images[exe_idx].first);
if (exe_module_sp.get() != target.GetExecutableModulePointer())
target.SetExecutableModule(exe_module_sp, eLoadDependentsNo);
@@ -594,14 +593,12 @@ void
DynamicLoaderDarwin::UpdateSpecialBinariesFromNewImageInfos(
}
if (dyld_idx != UINT32_MAX) {
- const bool can_create = true;
- ModuleSP dyld_sp = FindTargetModuleForImageInfo(image_infos[dyld_idx],
- can_create, nullptr);
+ ModuleSP dyld_sp = images[dyld_idx].second;
if (dyld_sp.get()) {
LLDB_LOGF(log, "Found dyld module: %s",
dyld_sp->GetFileSpec().GetPath().c_str());
target.GetImages().AppendIfNeeded(dyld_sp);
- UpdateImageLoadAddress(dyld_sp.get(), image_infos[dyld_idx]);
+ UpdateImageLoadAddress(dyld_sp.get(), images[dyld_idx].first);
SetDYLDModule(dyld_sp);
}
}
@@ -690,37 +687,51 @@ map(InputIterator first, InputIterator last,
return results;
}
+std::vector<std::pair<DynamicLoaderDarwin::ImageInfo, ModuleSP>>
+DynamicLoaderDarwin::PreloadModulesFromImageInfos(
+ const ImageInfo::collection &image_infos) {
+ auto ImageLoad = [this](const ImageInfo &image_info) {
+ return std::make_pair(
+ image_info, FindTargetModuleForImageInfo(image_info, true, nullptr));
+ };
+ bool is_parallel_load =
+ DynamicLoaderDarwinProperties::GetGlobal().GetEnableParallelImageLoad();
+ auto images = is_parallel_load
+ ? parallel_map<ImageInfo::collection::const_iterator,
+ std::pair<ImageInfo, ModuleSP>>(
+ Debugger::GetThreadPool(), image_infos.begin(),
+ image_infos.end(), ImageLoad)
+ : map<ImageInfo::collection::const_iterator,
+ std::pair<ImageInfo, ModuleSP>>(
+ image_infos.begin(), image_infos.end(), ImageLoad);
+ return images;
+}
+
bool DynamicLoaderDarwin::AddModulesUsingImageInfos(
ImageInfo::collection &image_infos) {
std::lock_guard<std::recursive_mutex> guard(m_mutex);
+ auto images = PreloadModulesFromImageInfos(image_infos);
+ return AddModulesUsingPreloadedModules(images);
+}
+
+bool DynamicLoaderDarwin::AddModulesUsingPreloadedModules(
+ std::vector<std::pair<ImageInfo, ModuleSP>> &images) {
+ std::lock_guard<std::recursive_mutex> guard(m_mutex);
// Now add these images to the main list.
ModuleList loaded_module_list;
Log *log = GetLog(LLDBLog::DynamicLoader);
Target &target = m_process->GetTarget();
ModuleList &target_images = target.GetImages();
- auto ImageLoad = [this, log](const ImageInfo &image_info) {
+ for (uint32_t idx = 0; idx < images.size(); ++idx) {
+ auto &image_info = images[idx].first;
+ const auto &image_module_sp = images[idx].second;
if (log) {
LLDB_LOGF(log, "Adding new image at address=0x%16.16" PRIx64 ".",
image_info.address);
image_info.PutToLog(log);
}
- return FindTargetModuleForImageInfo(image_info, true, nullptr);
- };
- bool is_parallel_load =
- DynamicLoaderDarwinProperties::GetGlobal().GetEnableParallelImageLoad();
- auto images =
- is_parallel_load
- ? parallel_map<ImageInfo::collection::const_iterator, ModuleSP>(
- Debugger::GetThreadPool(), image_infos.begin(),
- image_infos.end(), ImageLoad)
- : map<ImageInfo::collection::const_iterator, ModuleSP>(
- image_infos.begin(), image_infos.end(), ImageLoad);
-
- for (uint32_t idx = 0; idx < image_infos.size(); ++idx) {
- m_dyld_image_infos.push_back(image_infos[idx]);
-
- ModuleSP image_module_sp = images[idx];
+ m_dyld_image_infos.push_back(image_info);
if (image_module_sp) {
ObjectFile *objfile = image_module_sp->GetObjectFile();
@@ -732,7 +743,7 @@ bool DynamicLoaderDarwin::AddModulesUsingImageInfos(
sections->FindSectionByName(commpage_dbstr).get();
if (commpage_section) {
ModuleSpec module_spec(objfile->GetFileSpec(),
- image_infos[idx].GetArchitecture());
+ image_info.GetArchitecture());
module_spec.GetObjectName() = commpage_dbstr;
ModuleSP commpage_image_module_sp(
target_images.FindFirstModule(module_spec));
@@ -745,17 +756,17 @@ bool DynamicLoaderDarwin::AddModulesUsingImageInfos(
if (!commpage_image_module_sp ||
commpage_image_module_sp->GetObjectFile() == nullptr) {
commpage_image_module_sp = m_process->ReadModuleFromMemory(
- image_infos[idx].file_spec, image_infos[idx].address);
+ image_info.file_spec, image_info.address);
// Always load a memory image right away in the target in case
// we end up trying to read the symbol table from memory... The
// __LINKEDIT will need to be mapped so we can figure out where
// the symbol table bits are...
bool changed = false;
UpdateImageLoadAddress(commpage_image_module_sp.get(),
- image_infos[idx]);
+ image_info);
target.GetImages().Append(commpage_image_module_sp);
if (changed) {
- image_infos[idx].load_stop_id = m_process->GetStopID();
+ image_info.load_stop_id = m_process->GetStopID();
loaded_module_list.AppendIfNeeded(commpage_image_module_sp);
}
}
@@ -768,14 +779,14 @@ bool DynamicLoaderDarwin::AddModulesUsingImageInfos(
// address. We need to check this so we don't mention that all loaded
// shared libraries are newly loaded each time we hit out dyld breakpoint
// since dyld will list all shared libraries each time.
- if (UpdateImageLoadAddress(image_module_sp.get(), image_infos[idx])) {
+ if (UpdateImageLoadAddress(image_module_sp.get(), image_info)) {
target_images.AppendIfNeeded(image_module_sp);
loaded_module_list.AppendIfNeeded(image_module_sp);
}
// To support macCatalyst and legacy iOS simulator,
// update the module's platform with the DYLD info.
- ArchSpec dyld_spec = image_infos[idx].GetArchitecture();
+ ArchSpec dyld_spec = image_info.GetArchitecture();
auto &dyld_triple = dyld_spec.GetTriple();
if ((dyld_triple.getEnvironment() == llvm::Triple::MacABI &&
dyld_triple.getOS() == llvm::Triple::IOS) ||
diff --git
a/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderDarwin.h
b/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderDarwin.h
index b70a2da3cc95a9..bc5464d76b9503 100644
--- a/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderDarwin.h
+++ b/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderDarwin.h
@@ -203,11 +203,18 @@ class DynamicLoaderDarwin : public
lldb_private::DynamicLoader {
lldb_private::StructuredData::ObjectSP image_details,
ImageInfo::collection &image_infos);
- // If image_infos contains / may contain dyld or executable image, call this
- // method
- // to keep our internal record keeping of the special binaries up-to-date.
- void
- UpdateSpecialBinariesFromNewImageInfos(ImageInfo::collection &image_infos);
+ // Finds/loads modules for a given `image_infos` and returns pairs
+ // (ImageInfo, ModuleSP).
+ // Prefer using this method rather than calling
`FindTargetModuleForImageInfo`
+ // directly as this method may load the modules in parallel.
+ std::vector<std::pair<ImageInfo, lldb::ModuleSP>>
+ PreloadModulesFromImageInfos(const ImageInfo::collection &image_infos);
+
+ // If `images` contains / may contain dyld or executable image, call this
+ // method to keep our internal record keeping of the special binaries
+ // up-to-date.
+ void UpdateSpecialBinariesFromPreloadedModules(
+ std::vector<std::pair<ImageInfo, lldb::ModuleSP>> &images);
// if image_info is a dyld binary, call this method
bool UpdateDYLDImageInfoFromNewImageInfo(ImageInfo &image_info);
@@ -217,6 +224,8 @@ class DynamicLoaderDarwin : public
lldb_private::DynamicLoader {
void AddExecutableModuleIfInImageInfos(ImageInfo::collection &image_infos);
bool AddModulesUsingImageInfos(ImageInfo::collection &image_infos);
+ bool AddModulesUsingPreloadedModules(
+ std::vector<std::pair<ImageInfo, lldb::ModuleSP>> &images);
// Whether we should use the new dyld SPI to get shared library information,
// or read
diff --git
a/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOS.cpp
b/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOS.cpp
index a038b65d472834..82555d1e028b4c 100644
--- a/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOS.cpp
+++ b/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOS.cpp
@@ -215,8 +215,9 @@ void DynamicLoaderMacOS::DoInitialImageFetch() {
LLDB_LOGF(log, "Initial module fetch: Adding %" PRId64 " modules.\n",
(uint64_t)image_infos.size());
- UpdateSpecialBinariesFromNewImageInfos(image_infos);
- AddModulesUsingImageInfos(image_infos);
+ auto images = PreloadModulesFromImageInfos(image_infos);
+ UpdateSpecialBinariesFromPreloadedModules(images);
+ AddModulesUsingPreloadedModules(images);
}
}
@@ -425,8 +426,9 @@ void DynamicLoaderMacOS::AddBinaries(
->GetAsArray()
->GetSize() == load_addresses.size()) {
if (JSONImageInformationIntoImageInfo(binaries_info_sp, image_infos)) {
- UpdateSpecialBinariesFromNewImageInfos(image_infos);
- AddModulesUsingImageInfos(image_infos);
+ auto images = PreloadModulesFromImageInfos(image_infos);
+ UpdateSpecialBinariesFromPreloadedModules(images);
+ AddModulesUsingPreloadedModules(images);
}
m_dyld_image_infos_stop_id = m_process->GetStopID();
}
diff --git
a/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp
b/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp
index 0da565abb8a0f7..8fc77cbe117012 100644
--- a/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp
+++ b/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp
@@ -572,8 +572,9 @@ bool
DynamicLoaderMacOSXDYLD::AddModulesUsingImageInfosAddress(
->GetSize() == image_infos_count) {
bool return_value = false;
if (JSONImageInformationIntoImageInfo(image_infos_json_sp, image_infos)) {
- UpdateSpecialBinariesFromNewImageInfos(image_infos);
- return_value = AddModulesUsingImageInfos(image_infos);
+ auto images = PreloadModulesFromImageInfos(image_infos);
+ UpdateSpecialBinariesFromPreloadedModules(images);
+ return_value = AddModulesUsingPreloadedModules(images);
}
m_dyld_image_infos_stop_id = m_process->GetStopID();
return return_value;
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
