[Lldb-commits] [lldb] 018e5a9 - [lldb/Properties] Move OSPluginReportsAllThreads from Target to Process
Jonas Devlieghere via lldb-commits
lldb-commits at lists.llvm.org
Tue May 19 11:26:46 PDT 2020
Author: Jonas Devlieghere
Date: 2020-05-19T11:26:39-07:00
New Revision: 018e5a96eebd712dd743589327354d528865f9b6
URL: https://github.com/llvm/llvm-project/commit/018e5a96eebd712dd743589327354d528865f9b6
DIFF: https://github.com/llvm/llvm-project/commit/018e5a96eebd712dd743589327354d528865f9b6.diff
LOG: [lldb/Properties] Move OSPluginReportsAllThreads from Target to Process
This is what Jim wanted originally.
rdar://problem/61236293
Differential revision: https://reviews.llvm.org/D80159
Added:
Modified:
lldb/include/lldb/Target/Process.h
lldb/include/lldb/Target/Target.h
lldb/source/Target/Process.cpp
lldb/source/Target/Target.cpp
lldb/source/Target/TargetProperties.td
lldb/test/API/functionalities/plugins/python_os_plugin/stepping_plugin_threads/TestOSPluginStepping.py
Removed:
################################################################################
diff --git a/lldb/include/lldb/Target/Process.h b/lldb/include/lldb/Target/Process.h
index c5a1544a87a5..fe811deb7caa 100644
--- a/lldb/include/lldb/Target/Process.h
+++ b/lldb/include/lldb/Target/Process.h
@@ -58,7 +58,11 @@ namespace lldb_private {
template <typename B, typename S> struct Range;
-// ProcessProperties
+class ProcessExperimentalProperties : public Properties {
+public:
+ ProcessExperimentalProperties();
+};
+
class ProcessProperties : public Properties {
public:
// Pass nullptr for "process" if the ProcessProperties are to be the global
@@ -84,9 +88,12 @@ class ProcessProperties : public Properties {
bool GetWarningsOptimization() const;
bool GetStopOnExec() const;
std::chrono::seconds GetUtilityExpressionTimeout() const;
+ bool GetOSPluginReportsAllThreads() const;
+ void SetOSPluginReportsAllThreads(bool does_report);
protected:
Process *m_process; // Can be nullptr for global ProcessProperties
+ std::unique_ptr<ProcessExperimentalProperties> m_experimental_properties_up;
};
typedef std::shared_ptr<ProcessProperties> ProcessPropertiesSP;
diff --git a/lldb/include/lldb/Target/Target.h b/lldb/include/lldb/Target/Target.h
index b2cdea5c5d7a..a8c62917bea0 100644
--- a/lldb/include/lldb/Target/Target.h
+++ b/lldb/include/lldb/Target/Target.h
@@ -64,7 +64,6 @@ enum LoadDependentFiles {
eLoadDependentsNo,
};
-// TargetProperties
class TargetExperimentalProperties : public Properties {
public:
TargetExperimentalProperties();
@@ -207,10 +206,6 @@ class TargetProperties : public Properties {
void SetInjectLocalVariables(ExecutionContext *exe_ctx, bool b);
- bool GetOSPluginReportsAllThreads() const;
-
- void SetOSPluginReportsAllThreads(bool does_report);
-
void SetRequireHardwareBreakpoints(bool b);
bool GetRequireHardwareBreakpoints() const;
diff --git a/lldb/source/Target/Process.cpp b/lldb/source/Target/Process.cpp
index 989cdae8b402..7bd53af985d4 100644
--- a/lldb/source/Target/Process.cpp
+++ b/lldb/source/Target/Process.cpp
@@ -120,8 +120,30 @@ class ProcessOptionValueProperties : public OptionValueProperties {
enum {
#define LLDB_PROPERTIES_process
#include "TargetPropertiesEnum.inc"
+ ePropertyExperimental,
};
+#define LLDB_PROPERTIES_process_experimental
+#include "TargetProperties.inc"
+
+enum {
+#define LLDB_PROPERTIES_process_experimental
+#include "TargetPropertiesEnum.inc"
+};
+
+class ProcessExperimentalOptionValueProperties : public OptionValueProperties {
+public:
+ ProcessExperimentalOptionValueProperties()
+ : OptionValueProperties(
+ ConstString(Properties::GetExperimentalSettingsName())) {}
+};
+
+ProcessExperimentalProperties::ProcessExperimentalProperties()
+ : Properties(OptionValuePropertiesSP(
+ new ProcessExperimentalOptionValueProperties())) {
+ m_collection_sp->Initialize(g_process_experimental_properties);
+}
+
ProcessProperties::ProcessProperties(lldb_private::Process *process)
: Properties(),
m_process(process) // Can be nullptr for global ProcessProperties
@@ -141,6 +163,13 @@ ProcessProperties::ProcessProperties(lldb_private::Process *process)
ePropertyPythonOSPluginPath,
[this] { m_process->LoadOperatingSystemPlugin(true); });
}
+
+ m_experimental_properties_up.reset(new ProcessExperimentalProperties());
+ m_collection_sp->AppendProperty(
+ ConstString(Properties::GetExperimentalSettingsName()),
+ ConstString("Experimental settings - setting these won't produce "
+ "errors if the setting is not present."),
+ true, m_experimental_properties_up->GetValueProperties());
}
ProcessProperties::~ProcessProperties() = default;
@@ -242,6 +271,29 @@ std::chrono::seconds ProcessProperties::GetUtilityExpressionTimeout() const {
return std::chrono::seconds(value);
}
+bool ProcessProperties::GetOSPluginReportsAllThreads() const {
+ const bool fail_value = true;
+ const Property *exp_property =
+ m_collection_sp->GetPropertyAtIndex(nullptr, true, ePropertyExperimental);
+ OptionValueProperties *exp_values =
+ exp_property->GetValue()->GetAsProperties();
+ if (!exp_values)
+ return fail_value;
+
+ return exp_values->GetPropertyAtIndexAsBoolean(
+ nullptr, ePropertyOSPluginReportsAllThreads, fail_value);
+}
+
+void ProcessProperties::SetOSPluginReportsAllThreads(bool does_report) {
+ const Property *exp_property =
+ m_collection_sp->GetPropertyAtIndex(nullptr, true, ePropertyExperimental);
+ OptionValueProperties *exp_values =
+ exp_property->GetValue()->GetAsProperties();
+ if (exp_values)
+ exp_values->SetPropertyAtIndexAsBoolean(
+ nullptr, ePropertyOSPluginReportsAllThreads, does_report);
+}
+
Status ProcessLaunchCommandOptions::SetOptionValue(
uint32_t option_idx, llvm::StringRef option_arg,
ExecutionContext *execution_context) {
@@ -1213,7 +1265,7 @@ void Process::UpdateThreadListIfNeeded() {
// See if the OS plugin reports all threads. If it does, then
// it is safe to clear unseen thread's plans here. Otherwise we
// should preserve them in case they show up again:
- clear_unused_threads = GetTarget().GetOSPluginReportsAllThreads();
+ clear_unused_threads = GetOSPluginReportsAllThreads();
// Turn off dynamic types to ensure we don't run any expressions.
// Objective-C can run an expression to determine if a SBValue is a
diff --git a/lldb/source/Target/Target.cpp b/lldb/source/Target/Target.cpp
index 9c61ddeadcc8..c1575db6497a 100644
--- a/lldb/source/Target/Target.cpp
+++ b/lldb/source/Target/Target.cpp
@@ -3373,11 +3373,11 @@ class TargetOptionValueProperties : public OptionValueProperties {
};
// TargetProperties
-#define LLDB_PROPERTIES_experimental
+#define LLDB_PROPERTIES_target_experimental
#include "TargetProperties.inc"
enum {
-#define LLDB_PROPERTIES_experimental
+#define LLDB_PROPERTIES_target_experimental
#include "TargetPropertiesEnum.inc"
};
@@ -3391,7 +3391,7 @@ class TargetExperimentalOptionValueProperties : public OptionValueProperties {
TargetExperimentalProperties::TargetExperimentalProperties()
: Properties(OptionValuePropertiesSP(
new TargetExperimentalOptionValueProperties())) {
- m_collection_sp->Initialize(g_experimental_properties);
+ m_collection_sp->Initialize(g_target_experimental_properties);
}
// TargetProperties
@@ -3487,34 +3487,6 @@ void TargetProperties::SetInjectLocalVariables(ExecutionContext *exe_ctx,
true);
}
-bool TargetProperties::GetOSPluginReportsAllThreads() const {
- const bool fail_value = true;
- const Property *exp_property =
- m_collection_sp->GetPropertyAtIndex(nullptr, true, ePropertyExperimental);
- OptionValueProperties *exp_values =
- exp_property->GetValue()->GetAsProperties();
- if (!exp_values)
- return fail_value;
-
- return
- exp_values->GetPropertyAtIndexAsBoolean(nullptr,
- ePropertyOSPluginReportsAllThreads,
- fail_value);
-}
-
-void TargetProperties::SetOSPluginReportsAllThreads(bool does_report) {
- const Property *exp_property =
- m_collection_sp->GetPropertyAtIndex(nullptr, true, ePropertyExperimental);
- OptionValueProperties *exp_values =
- exp_property->GetValue()->GetAsProperties();
- if (exp_values)
- exp_values->SetPropertyAtIndexAsBoolean(nullptr,
- ePropertyOSPluginReportsAllThreads,
- does_report);
-}
-
-
-
ArchSpec TargetProperties::GetDefaultArchitecture() const {
OptionValueArch *value = m_collection_sp->GetPropertyAtIndexAsOptionValueArch(
nullptr, ePropertyDefaultArch);
@@ -4084,7 +4056,7 @@ Target::TargetEventData::GetModuleListFromEvent(const Event *event_ptr) {
return module_list;
}
-std::recursive_mutex &Target::GetAPIMutex() {
+std::recursive_mutex &Target::GetAPIMutex() {
if (GetProcessSP() && GetProcessSP()->CurrentThreadIsPrivateStateThread())
return m_private_mutex;
else
diff --git a/lldb/source/Target/TargetProperties.td b/lldb/source/Target/TargetProperties.td
index a73f1a3b695c..8f3a6b04bb69 100644
--- a/lldb/source/Target/TargetProperties.td
+++ b/lldb/source/Target/TargetProperties.td
@@ -1,13 +1,9 @@
include "../../include/lldb/Core/PropertiesBase.td"
-let Definition = "experimental" in {
+let Definition = "target_experimental" in {
def InjectLocalVars : Property<"inject-local-vars", "Boolean">,
Global, DefaultTrue,
Desc<"If true, inject local variables explicitly into the expression text. This will fix symbol resolution when there are name collisions between ivars and local variables. But it can make expressions run much more slowly.">;
- def OSPluginReportsAllThreads: Property<"os-plugin-reports-all-threads", "Boolean">,
- Global,
- DefaultTrue,
- Desc<"Set to False if your OS Plugins doesn't report all threads on each stop.">;
}
let Definition = "target" in {
@@ -169,6 +165,13 @@ let Definition = "target" in {
Desc<"Always install the main executable when connected to a remote platform.">;
}
+let Definition = "process_experimental" in {
+ def OSPluginReportsAllThreads: Property<"os-plugin-reports-all-threads", "Boolean">,
+ Global,
+ DefaultTrue,
+ Desc<"Set to False if your OS Plugins doesn't report all threads on each stop.">;
+}
+
let Definition = "process" in {
def DisableMemCache: Property<"disable-memory-cache", "Boolean">,
DefaultFalse,
diff --git a/lldb/test/API/functionalities/plugins/python_os_plugin/stepping_plugin_threads/TestOSPluginStepping.py b/lldb/test/API/functionalities/plugins/python_os_plugin/stepping_plugin_threads/TestOSPluginStepping.py
index 1a625cee5d86..87d1e383831b 100644
--- a/lldb/test/API/functionalities/plugins/python_os_plugin/stepping_plugin_threads/TestOSPluginStepping.py
+++ b/lldb/test/API/functionalities/plugins/python_os_plugin/stepping_plugin_threads/TestOSPluginStepping.py
@@ -44,7 +44,7 @@ def run_python_os_step_missing_thread(self, do_prune):
"""Test that the Python operating system plugin works correctly"""
# Our OS plugin does NOT report all threads:
- result = self.dbg.HandleCommand("settings set target.experimental.os-plugin-reports-all-threads false")
+ result = self.dbg.HandleCommand("settings set process.experimental.os-plugin-reports-all-threads false")
python_os_plugin_path = os.path.join(self.getSourceDir(),
"operating_system.py")
More information about the lldb-commits
mailing list