This revision was landed with ongoing or failed builds.
This revision was automatically updated to reflect the committed changes.
Closed by commit rGc19280330474: [lldb] Add a way to get a scripted process
implementation from the SBAPI (authored by mib).
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D143236/new/
https://reviews.llvm.org/D143236
Files:
lldb/bindings/interface/SBProcess.i
lldb/bindings/python/python-typemaps.swig
lldb/include/lldb/API/SBDefines.h
lldb/include/lldb/API/SBProcess.h
lldb/include/lldb/Target/Process.h
lldb/source/API/SBProcess.cpp
lldb/source/Plugins/Process/scripted/ScriptedProcess.cpp
lldb/source/Plugins/Process/scripted/ScriptedProcess.h
lldb/test/API/functionalities/scripted_process/TestScriptedProcess.py
lldb/test/API/functionalities/scripted_process/dummy_scripted_process.py
lldb/test/API/python_api/process/TestProcessAPI.py
Index: lldb/test/API/python_api/process/TestProcessAPI.py
===================================================================
--- lldb/test/API/python_api/process/TestProcessAPI.py
+++ lldb/test/API/python_api/process/TestProcessAPI.py
@@ -18,6 +18,18 @@
"main.cpp",
"// Set break point at this line and check variable 'my_char'.")
+ def test_scripted_implementation(self):
+ self.build()
+ exe = self.getBuildArtifact("a.out")
+
+ (target, process, _, _) = \
+ lldbutil.run_to_source_breakpoint(self, "Set break point",
+ lldb.SBFileSpec("main.cpp"))
+
+ self.assertTrue(process, PROCESS_IS_VALID)
+ self.assertEqual(process.GetScriptedImplementation(), None)
+
+
def test_read_memory(self):
"""Test Python SBProcess.ReadMemory() API."""
self.build()
Index: lldb/test/API/functionalities/scripted_process/dummy_scripted_process.py
===================================================================
--- lldb/test/API/functionalities/scripted_process/dummy_scripted_process.py
+++ lldb/test/API/functionalities/scripted_process/dummy_scripted_process.py
@@ -43,6 +43,12 @@
def get_scripted_thread_plugin(self):
return DummyScriptedThread.__module__ + "." + DummyScriptedThread.__name__
+ def my_super_secret_method(self):
+ if hasattr(self, 'my_super_secret_member'):
+ return self.my_super_secret_member
+ else:
+ return None
+
class DummyScriptedThread(ScriptedThread):
def __init__(self, process, args):
Index: lldb/test/API/functionalities/scripted_process/TestScriptedProcess.py
===================================================================
--- lldb/test/API/functionalities/scripted_process/TestScriptedProcess.py
+++ lldb/test/API/functionalities/scripted_process/TestScriptedProcess.py
@@ -10,6 +10,8 @@
from lldbsuite.test import lldbutil
from lldbsuite.test import lldbtest
+import dummy_scripted_process
+
class ScriptedProcesTestCase(TestBase):
NO_DEBUG_INFO_TESTCASE = True
@@ -118,6 +120,14 @@
self.assertEqual(process.GetProcessID(), 42)
self.assertEqual(process.GetNumThreads(), 1)
+ py_impl = process.GetScriptedImplementation()
+ self.assertTrue(py_impl)
+ self.assertTrue(isinstance(py_impl, dummy_scripted_process.DummyScriptedProcess))
+ self.assertFalse(hasattr(py_impl, 'my_super_secret_member'))
+ py_impl.my_super_secret_member = 42
+ self.assertTrue(hasattr(py_impl, 'my_super_secret_member'))
+ self.assertEqual(py_impl.my_super_secret_method(), 42)
+
addr = 0x500000000
message = "Hello, world!"
buff = process.ReadCStringFromMemory(addr, len(message) + 1, error)
Index: lldb/source/Plugins/Process/scripted/ScriptedProcess.h
===================================================================
--- lldb/source/Plugins/Process/scripted/ScriptedProcess.h
+++ lldb/source/Plugins/Process/scripted/ScriptedProcess.h
@@ -74,6 +74,8 @@
void UpdateQueueListIfNeeded() override;
+ void *GetImplementation() override;
+
protected:
ScriptedProcess(lldb::TargetSP target_sp, lldb::ListenerSP listener_sp,
const ScriptedMetadata &scripted_metadata, Status &error);
Index: lldb/source/Plugins/Process/scripted/ScriptedProcess.cpp
===================================================================
--- lldb/source/Plugins/Process/scripted/ScriptedProcess.cpp
+++ lldb/source/Plugins/Process/scripted/ScriptedProcess.cpp
@@ -512,3 +512,10 @@
ScriptedProcessInterface &ScriptedProcess::GetInterface() const {
return m_interpreter->GetScriptedProcessInterface();
}
+
+void *ScriptedProcess::GetImplementation() {
+ if (m_script_object_sp &&
+ m_script_object_sp->GetType() == eStructuredDataTypeGeneric)
+ return m_script_object_sp->GetAsGeneric()->GetValue();
+ return nullptr;
+}
Index: lldb/source/API/SBProcess.cpp
===================================================================
--- lldb/source/API/SBProcess.cpp
+++ lldb/source/API/SBProcess.cpp
@@ -1262,3 +1262,9 @@
}
return sb_error;
}
+
+ScriptedObject SBProcess::GetScriptedImplementation() {
+ LLDB_INSTRUMENT_VA(this);
+ ProcessSP process_sp(GetSP());
+ return (process_sp) ? process_sp->GetImplementation() : nullptr;
+}
Index: lldb/include/lldb/Target/Process.h
===================================================================
--- lldb/include/lldb/Target/Process.h
+++ lldb/include/lldb/Target/Process.h
@@ -2526,6 +2526,8 @@
lldb::StructuredDataPluginSP
GetStructuredDataPlugin(ConstString type_name) const;
+ virtual void *GetImplementation() { return nullptr; }
+
protected:
friend class Trace;
Index: lldb/include/lldb/API/SBProcess.h
===================================================================
--- lldb/include/lldb/API/SBProcess.h
+++ lldb/include/lldb/API/SBProcess.h
@@ -423,6 +423,8 @@
///
lldb::SBError DeallocateMemory(lldb::addr_t ptr);
+ lldb::ScriptedObject GetScriptedImplementation();
+
protected:
friend class SBAddress;
friend class SBBreakpoint;
Index: lldb/include/lldb/API/SBDefines.h
===================================================================
--- lldb/include/lldb/API/SBDefines.h
+++ lldb/include/lldb/API/SBDefines.h
@@ -110,6 +110,7 @@
typedef bool (*SBBreakpointHitCallback)(void *baton, SBProcess &process,
SBThread &thread,
lldb::SBBreakpointLocation &location);
+typedef void *ScriptedObject;
}
#endif // LLDB_API_SBDEFINES_H
Index: lldb/bindings/python/python-typemaps.swig
===================================================================
--- lldb/bindings/python/python-typemaps.swig
+++ lldb/bindings/python/python-typemaps.swig
@@ -54,6 +54,16 @@
free((char *) $1);
}
+%typemap(out) lldb::ScriptedObject {
+ $result = nullptr;
+ if (const void* impl = $1)
+ $result = (PyObject*) impl;
+ if (!$result) {
+ $result = Py_None;
+ Py_INCREF(Py_None);
+ }
+}
+
%typemap(out) char** {
int len;
int i;
Index: lldb/bindings/interface/SBProcess.i
===================================================================
--- lldb/bindings/interface/SBProcess.i
+++ lldb/bindings/interface/SBProcess.i
@@ -344,6 +344,12 @@
bool
GetDescription (lldb::SBStream &description);
+ %feature("autodoc", "
+ Returns the implementation object of the process plugin if available. None
+ otherwise.") GetScriptedImplementation;
+ ScriptedObject
+ GetScriptedImplementation();
+
%feature("autodoc", "
Returns the process' extended crash information.") GetExtendedCrashInformation;
lldb::SBStructuredData
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
