Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Fix deadlock on shutdown if test_current_{exception,frames} fails #102019

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DinoV merged 3 commits into from
Feb 23, 2023
Merged

Fix deadlock on shutdown if test_current_{exception,frames} fails #102019

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7b9c592
Don't deadlock on shutdown if test_current_{exception,frames} fails
jbower-fb Jan 19, 2023
2e3b2e7
Add a news entry
arhadthedev Feb 18, 2023
9a19c10
Fix whitespace
jbower-fb Feb 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Fix whitespace
  • Loading branch information
@jbower-fb
jbower-fb committed Feb 23, 2023
commit 9a19c1064f9d0526e28053fd5557eaef09616829
24 changes: 12 additions & 12 deletions Lib/test/test_sys.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -444,27 +444,27 @@ def g456():
t = threading.Thread(target=f123)
t.start()
entered_g.wait()

try:
# At this point, t has finished its entered_g.set(), although it's
# impossible to guess whether it's still on that line or has moved on
# to its leave_g.wait().
self.assertEqual(len(thread_info), 1)
thread_id = thread_info[0]

d = sys._current_frames()
for tid in d:
self.assertIsInstance(tid, int)
self.assertGreater(tid, 0)

main_id = threading.get_ident()
self.assertIn(main_id, d)
self.assertIn(thread_id, d)

# Verify that the captured main-thread frame is _this_ frame.
frame = d.pop(main_id)
self.assertTrue(frame is sys._getframe())

# Verify that the captured thread frame is blocked in g456, called
# from f123. This is a little tricky, since various bits of
# threading.py are also in the thread's call stack.
Expand All @@ -475,9 +475,9 @@ def g456():
break
else:
self.fail("didn't find f123() on thread's call stack")

self.assertEqual(sourceline, "g456()")

# And the next record must be for g456().
filename, lineno, funcname, sourceline = stack[i+1]
self.assertEqual(funcname, "g456")
Expand Down Expand Up @@ -523,17 +523,17 @@ def g456():
# to its leave_g.wait().
self.assertEqual(len(thread_info), 1)
thread_id = thread_info[0]

d = sys._current_exceptions()
for tid in d:
self.assertIsInstance(tid, int)
self.assertGreater(tid, 0)

main_id = threading.get_ident()
self.assertIn(main_id, d)
self.assertIn(thread_id, d)
self.assertEqual((None, None, None), d.pop(main_id))

# Verify that the captured thread frame is blocked in g456, called
# from f123. This is a little tricky, since various bits of
# threading.py are also in the thread's call stack.
Expand All @@ -544,9 +544,9 @@ def g456():
break
else:
self.fail("didn't find f123() on thread's call stack")

self.assertEqual(sourceline, "g456()")

# And the next record must be for g456().
filename, lineno, funcname, sourceline = stack[i+1]
self.assertEqual(funcname, "g456")
Expand Down