[2.7] Clear potential ref cycle between Process and Process target (GH-2470) (#2473)
* Clear potential ref cycle between Process and Process target
Besides Process.join() not being called, this was an indirect cause of bpo-30775.
The threading module already does this.
* Add issue reference.
(cherry picked from commit 79d37ae979
)
This commit is contained in:
parent
5b5002c466
commit
12536bd261
|
@ -128,6 +128,9 @@ class Process(object):
|
|||
else:
|
||||
from .forking import Popen
|
||||
self._popen = Popen(self)
|
||||
# Avoid a refcycle if the target function holds an indirect
|
||||
# reference to the process object (see bpo-30775)
|
||||
del self._target, self._args, self._kwargs
|
||||
_current_process._children.add(self)
|
||||
|
||||
def terminate(self):
|
||||
|
|
|
@ -175,6 +175,12 @@ def get_value(self):
|
|||
# Testcases
|
||||
#
|
||||
|
||||
class DummyCallable(object):
|
||||
def __call__(self, q, c):
|
||||
assert isinstance(c, DummyCallable)
|
||||
q.put(5)
|
||||
|
||||
|
||||
class _TestProcess(BaseTestCase):
|
||||
|
||||
ALLOWED_TYPES = ('processes', 'threads')
|
||||
|
@ -355,6 +361,18 @@ class _TestProcess(BaseTestCase):
|
|||
p.join(5)
|
||||
self.assertEqual(p.exitcode, reason)
|
||||
|
||||
def test_lose_target_ref(self):
|
||||
c = DummyCallable()
|
||||
wr = weakref.ref(c)
|
||||
q = self.Queue()
|
||||
p = self.Process(target=c, args=(q, c))
|
||||
del c
|
||||
p.start()
|
||||
p.join()
|
||||
self.assertIs(wr(), None)
|
||||
self.assertEqual(q.get(), 5)
|
||||
|
||||
|
||||
#
|
||||
#
|
||||
#
|
||||
|
|
Loading…
Reference in New Issue