Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

bpo-31249: Fix ref cycle in ThreadPoolExecutor (#3178) 

* bpo-31249: Fix ref cycle in ThreadPoolExecutor

concurrent.futures: WorkItem.run() used by ThreadPoolExecutor now
breaks a reference cycle between an exception object and the WorkItem
object. ThreadPoolExecutor.shutdown() now also clears its threads
set.

* shutdown() now only clears threads if wait is true.

* Revert changes on shutdown()
This commit is contained in:
Victor Stinner 2017-08-22 16:50:42 +02:00 committed by GitHub
parent 5fe59f8e3a
commit bc61315377
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Lib/concurrent/futures/thread.py
View File

@ -54,8 +54,10 @@ class _WorkItem(object):
try: try:
result = self.fn(*self.args, **self.kwargs) result = self.fn(*self.args, **self.kwargs)
except BaseException as e: except BaseException as exc:
self.future.set_exception(e) self.future.set_exception(exc)
# Break a reference cycle with the exception 'exc'
self = None
else: else:
self.future.set_result(result) self.future.set_result(result)

2
Misc/NEWS.d/next/Library/2017-08-22-12-44-48.bpo-31249.STPbb9.rst Normal file
View File

@ -0,0 +1,2 @@
concurrent.futures: WorkItem.run() used by ThreadPoolExecutor now breaks a
reference cycle between an exception object and the WorkItem object.