llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT--> @llvm/pr-subscribers-lldb Author: Med Ismail Bennani (medismailben) <details> <summary>Changes</summary> This patch makes sure that scripted process are compatible with target stop-hooks. This wasn't tested in the past, but it turned out to be working out of the box. rdar://124396534 --- Full diff: https://github.com/llvm/llvm-project/pull/91107.diff 2 Files Affected: - (modified) lldb/test/API/functionalities/scripted_process/TestScriptedProcess.py (+7) - (modified) lldb/test/API/functionalities/scripted_process/dummy_scripted_process.py (+15) ``````````diff diff --git a/lldb/test/API/functionalities/scripted_process/TestScriptedProcess.py b/lldb/test/API/functionalities/scripted_process/TestScriptedProcess.py index 5aaf68575623ce..9519c576689d0e 100644 --- a/lldb/test/API/functionalities/scripted_process/TestScriptedProcess.py +++ b/lldb/test/API/functionalities/scripted_process/TestScriptedProcess.py @@ -187,6 +187,10 @@ def cleanup(): + os.path.join(self.getSourceDir(), scripted_process_example_relpath) ) + self.runCmd( + "target stop-hook add -k first -v 1 -k second -v 2 -P dummy_scripted_process.DummyStopHook" + ) + launch_info = lldb.SBLaunchInfo(None) launch_info.SetProcessPluginName("ScriptedProcess") launch_info.SetScriptedProcessClassName( @@ -207,6 +211,9 @@ def cleanup(): self.assertTrue(hasattr(py_impl, "my_super_secret_member")) self.assertEqual(py_impl.my_super_secret_method(), 42) + self.assertTrue(hasattr(py_impl, "handled_stop")) + self.assertTrue(py_impl.handled_stop) + # Try reading from target #0 process ... addr = 0x500000000 message = "Hello, target 0" diff --git a/lldb/test/API/functionalities/scripted_process/dummy_scripted_process.py b/lldb/test/API/functionalities/scripted_process/dummy_scripted_process.py index 5aff3aa4bb5597..d256586eb9ae58 100644 --- a/lldb/test/API/functionalities/scripted_process/dummy_scripted_process.py +++ b/lldb/test/API/functionalities/scripted_process/dummy_scripted_process.py @@ -7,6 +7,16 @@ from lldb.plugins.scripted_process import ScriptedThread +class DummyStopHook: + def __init__(self, target, args, internal_dict): + self.target = target + self.args = args + + def handle_stop(self, exe_ctx, stream): + print("My DummyStopHook triggered. Printing args: \n%s" % self.args) + sp = exe_ctx.process.GetScriptedImplementation() + sp.handled_stop = True + class DummyScriptedProcess(ScriptedProcess): memory = None @@ -18,6 +28,7 @@ def __init__(self, exe_ctx: lldb.SBExecutionContext, args: lldb.SBStructuredData debugger = self.target.GetDebugger() index = debugger.GetIndexOfTarget(self.target) self.memory[addr] = "Hello, target " + str(index) + self.handled_stop = False def read_memory_at_address( self, addr: int, size: int, error: lldb.SBError @@ -100,6 +111,10 @@ def get_register_context(self) -> str: def __lldb_init_module(debugger, dict): if not "SKIP_SCRIPTED_PROCESS_LAUNCH" in os.environ: + debugger.HandleCommand( + "target stop-hook add -k first -v 1 -k second -v 2 -P %s.%s" + % (__name__, DummyStopHook.__name__) + ) debugger.HandleCommand( "process launch -C %s.%s" % (__name__, DummyScriptedProcess.__name__) ) `````````` </details> https://github.com/llvm/llvm-project/pull/91107 _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
