Replace the singleton "ShadowListener" with a primary and N secondary Listeners

Before the addition of the process "Shadow Listener" you could only have one
Listener observing the Process Broadcaster.  That was necessary because fetching the
Process event is what switches the public process state, and for the execution
control logic to be manageable you needed to keep other listeners from causing
this to happen before the main process control engine was ready.

Ismail added the notion of a "ShadowListener" - which allowed you ONE
extra process listener.  This patch inverts that setup by designating the
first listener as primary - and giving it priority in fetching events.

Differential Revision: https://reviews.llvm.org/D157556
This commit is contained in:
Jim Ingham committed 2023-08-16 10:35:32 -07:00
1 parent 329979cf37
commit 2e7aa2ee34
10 files changed
+313 -65

No files matched your search

@@ -22,8 +22,10 @@ class TestInteractiveScriptedProcess(TestBase):
self.script_module = "interactive_scripted_process"
self.script_file = self.script_module + ".py"
# These tests are flakey and sometimes timeout. They work most of the time
# so the basic event flow is right, but somehow the handling is off.
@skipUnlessDarwin
@skipIfDarwin
@skipIfDarwin
def test_passthrough_launch(self):
"""Test a simple pass-through process launch"""
self.passthrough_launch()
@@ -34,6 +36,15 @@ class TestInteractiveScriptedProcess(TestBase):
self.assertSuccess(error, "Resuming multiplexer scripted process")
self.assertTrue(self.mux_process.IsValid(), "Got a valid process")
event = lldbutil.fetch_next_event(
self, self.dbg.GetListener(), self.mux_process.GetBroadcaster(), timeout=20
)
self.assertState(lldb.SBProcess.GetStateFromEvent(event), lldb.eStateRunning)
event = lldbutil.fetch_next_event(
self, self.dbg.GetListener(), self.mux_process.GetBroadcaster()
)
self.assertState(lldb.SBProcess.GetStateFromEvent(event), lldb.eStateStopped)
event = lldbutil.fetch_next_event(
self, self.mux_process_listener, self.mux_process.GetBroadcaster()
)
@@ -178,6 +189,13 @@ class TestInteractiveScriptedProcess(TestBase):
)
execution_events[event_target_idx][state] = True
for _ in range((self.dbg.GetNumTargets() - 1) * 2):
fetch_process_event(self, execution_events)
for target_index, event_states in execution_events.items():
for state, is_set in event_states.items():
self.assertTrue(is_set, f"Target {target_index} has state {state} set")
event = lldbutil.fetch_next_event(
self, self.mux_process_listener, self.mux_process.GetBroadcaster()
)
@@ -188,13 +206,6 @@ class TestInteractiveScriptedProcess(TestBase):
)
self.assertState(lldb.SBProcess.GetStateFromEvent(event), lldb.eStateStopped)
for _ in range((self.dbg.GetNumTargets() - 1) * 2):
fetch_process_event(self, execution_events)
for target_index, event_states in execution_events.items():
for state, is_set in event_states.items():
self.assertTrue(is_set, f"Target {target_index} has state {state} set")
def duplicate_target(self, driving_target):
exe = driving_target.executable.fullpath
triple = driving_target.triple
@@ -248,16 +259,16 @@ class TestInteractiveScriptedProcess(TestBase):
self.assertSuccess(error, "Launched multiplexer scripted process")
self.assertTrue(self.mux_process.IsValid(), "Got a valid process")
# Check that the mux process started running
event = lldbutil.fetch_next_event(
self, self.mux_process_listener, self.mux_process.GetBroadcaster()
)
self.assertState(lldb.SBProcess.GetStateFromEvent(event), lldb.eStateRunning)
# Check that the real process started running
event = lldbutil.fetch_next_event(
self, self.dbg.GetListener(), self.mux_process.GetBroadcaster()
)
self.assertState(lldb.SBProcess.GetStateFromEvent(event), lldb.eStateRunning)
# Check that the mux process started running
event = lldbutil.fetch_next_event(
self, self.mux_process_listener, self.mux_process.GetBroadcaster()
)
self.assertState(lldb.SBProcess.GetStateFromEvent(event), lldb.eStateRunning)
# Check that the real process stopped
event = lldbutil.fetch_next_event(