https://github.com/python/cpython/commit/520cf2170ea08730e142d591e311b7ab8a6afe63
commit: 520cf2170ea08730e142d591e311b7ab8a6afe63
branch: main
author: Sam Gross <[email protected]>
committer: colesbury <[email protected]>
date: 2024-04-15T12:54:56-04:00
summary:
gh-117688: Fix deadlock in test_no_stale_references with GIL disabled (#117720)
Check `my_object_collected.wait()` in a loop to give the main thread a
chance to merge the reference count fields. Additionally, call
`my_object_collected.set()` in a background thread to avoid deadlocking
when the destructor is called asynchronously via the eval breaker
within the body of of `my_object_collected.wait()`.
files:
M Lib/test/test_concurrent_futures/executor.py
diff --git a/Lib/test/test_concurrent_futures/executor.py
b/Lib/test/test_concurrent_futures/executor.py
index 6a79fe69ec37cf..3049bb74861439 100644
--- a/Lib/test/test_concurrent_futures/executor.py
+++ b/Lib/test/test_concurrent_futures/executor.py
@@ -83,24 +83,34 @@ def test_no_stale_references(self):
# references.
my_object = MyObject()
my_object_collected = threading.Event()
- my_object_callback = weakref.ref(
- my_object, lambda obj: my_object_collected.set())
- fut = self.executor.submit(my_object.my_method)
+ def set_event():
+ if Py_GIL_DISABLED:
+ # gh-117688 Avoid deadlock by setting the event in a
+ # background thread. The current thread may be in the middle
+ # of the my_object_collected.wait() call, which holds locks
+ # needed by my_object_collected.set().
+ threading.Thread(target=my_object_collected.set).start()
+ else:
+ my_object_collected.set()
+ my_object_callback = weakref.ref(my_object, lambda obj: set_event())
+ # Deliberately discarding the future.
+ self.executor.submit(my_object.my_method)
del my_object
if Py_GIL_DISABLED:
# Due to biased reference counting, my_object might only be
# deallocated while the thread that created it runs -- if the
# thread is paused waiting on an event, it may not merge the
- # refcount of the queued object. For that reason, we wait for the
- # task to finish (so that it's no longer referenced) and force a
- # GC to ensure that it is collected.
- fut.result() # Wait for the task to finish.
- support.gc_collect()
+ # refcount of the queued object. For that reason, we alternate
+ # between running the GC and waiting for the event.
+ wait_time = 0
+ collected = False
+ while not collected and wait_time <= support.SHORT_TIMEOUT:
+ support.gc_collect()
+ collected = my_object_collected.wait(timeout=1.0)
+ wait_time += 1.0
else:
- del fut # Deliberately discard the future.
-
- collected = my_object_collected.wait(timeout=support.SHORT_TIMEOUT)
+ collected = my_object_collected.wait(timeout=support.SHORT_TIMEOUT)
self.assertTrue(collected,
"Stale reference not collected within timeout.")
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]
