Skip to content
Merged
Changes from 2 commits
Commits
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
20 changes: 9 additions & 11 deletions Lib/multiprocessing/resource_tracker.py
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,16 @@ def _reentrant_call_error(self):
raise ReentrantCallError(
"Reentrant call into the multiprocessing resource tracker")

def __del__(self):
# making sure child processess are cleaned before ResourceTracker
# gets destructed.
# see https://github.com/python/cpython/issues/88887
self._stop()

def _stop(self):
Comment thread
gpshead marked this conversation as resolved.
Outdated
with self._lock:
Comment thread
gpshead marked this conversation as resolved.
Outdated
if self._pid is None:
return
# This should not happen (_stop() isn't called by a finalizer)
# but we check for it anyway.
Comment thread
gpshead marked this conversation as resolved.
Outdated
if self._lock._recursion_count() > 1:
Expand Down Expand Up @@ -191,7 +199,7 @@ def unregister(self, name, rtype):
'''Unregister name of resource with resource tracker.'''
self._send('UNREGISTER', name, rtype)

def _send(self, cmd, name, rtype):
def _send(self, cmd, name, rtype)::77
Comment thread
luccabb marked this conversation as resolved.
Outdated
try:
self.ensure_running()
except ReentrantCallError:
Expand All @@ -212,16 +220,6 @@ def _send(self, cmd, name, rtype):
assert nbytes == len(msg), "nbytes {0:n} but len(msg) {1:n}".format(
nbytes, len(msg))

def __del__(self):
# making sure child processess are cleaned before ResourceTracker
# gets destructed.
# see https://github.com/python/cpython/issues/88887
try:
self._stop()
except (OSError, TypeError, AttributeError):
pass


_resource_tracker = ResourceTracker()
ensure_running = _resource_tracker.ensure_running
register = _resource_tracker.register
Expand Down