maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Revert "[lldb/test] Fix TestProgressReporting.py race issue with the event listener" 

This reverts commit 3e3e79a9e4.

MemorySanitizer: use-of-uninitialized-value
This commit is contained in:
Michael Forster 2022-02-25 13:07:49 +00:00
parent 4ae1855356
commit 4729a72ace
2 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lldb/bindings/interface/SBDebugger.i
View File

@ -123,11 +123,14 @@ public:
};
%apply uint64_t& INOUT { uint64_t& progress_id };
%apply uint64_t& INOUT { uint64_t& completed };
%apply uint64_t& INOUT { uint64_t& total };
%apply bool& INOUT { bool& is_debugger_specific };
static const char *GetProgressFromEvent(const lldb::SBEvent &event,
uint64_t &OUTPUT,
uint64_t &OUTPUT,
uint64_t &OUTPUT,
bool &OUTPUT);
uint64_t &progress_id,
uint64_t &completed, uint64_t &total,
bool &is_debugger_specific);
SBBroadcaster GetBroadcaster();

37
lldb/test/API/functionalities/progress_reporting/TestProgressReporting.py
View File

@ -17,42 +17,41 @@ class TestProgressReporting(TestBase):
TestBase.setUp(self)
self.progress_events = []
def fetch_events(self):
def fetch_events(self, test_broadcaster):
listener = lldb.SBListener("lldb.progress.listener")
listener.StartListeningForEvents(test_broadcaster,
self.eBroadcastBitStopProgressThread)
progress_broadcaster = self.dbg.GetBroadcaster()
progress_broadcaster.AddListener(listener, lldb.SBDebugger.eBroadcastBitProgress)
event = lldb.SBEvent()
done = False
while not done:
if self.listener.WaitForEvent(1, event):
if listener.WaitForEvent(1, event):
event_mask = event.GetType();
if event.BroadcasterMatchesRef(self.test_broadcaster):
if event.BroadcasterMatchesRef(test_broadcaster):
if event_mask & self.eBroadcastBitStopProgressThread:
done = True;
elif event.BroadcasterMatchesRef(self.progress_broadcaster):
ret_args = lldb.SBDebugger().GetProgressFromEvent(event);
self.assertGreater(len(ret_args), 1)
message = ret_args[0]
elif event.BroadcasterMatchesRef(progress_broadcaster):
message = lldb.SBDebugger().GetProgressFromEvent(event, 0, 0, 0, False);
if message:
self.progress_events.append((message, event))
@skipUnlessDarwin
def test_dwarf_symbol_loading_progress_report(self):
"""Test that we are able to fetch dwarf symbol loading progress events"""
self.build()
self.listener = lldb.SBListener("lldb.progress.listener")
self.test_broadcaster = lldb.SBBroadcaster('lldb.broadcaster.test')
self.listener.StartListeningForEvents(self.test_broadcaster,
self.eBroadcastBitStopProgressThread)
self.progress_broadcaster = self.dbg.GetBroadcaster()
self.progress_broadcaster.AddListener(self.listener, lldb.SBDebugger.eBroadcastBitProgress)
listener_thread = threading.Thread(target=self.fetch_events)
test_broadcaster = lldb.SBBroadcaster('lldb.broadcaster.test')
listener_thread = threading.Thread(target=self.fetch_events,
args=[test_broadcaster])
listener_thread.start()
lldbutil.run_to_source_breakpoint(self, 'break here', lldb.SBFileSpec('main.c'))
self.test_broadcaster.BroadcastEventByType(self.eBroadcastBitStopProgressThread)
test_broadcaster.BroadcastEventByType(self.eBroadcastBitStopProgressThread)
listener_thread.join()
self.assertGreater(len(self.progress_events), 0)
self.assertTrue(len(self.progress_events) > 0)