Commit 739ae569 authored by Richard Oudkerk's avatar Richard Oudkerk

Issue #14548: Make multiprocessing finalizers check pid before running

This protects from possibilty of gc running just after fork.
parent 692130a2
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
import sys import sys
import functools import functools
import os
import itertools import itertools
import weakref import weakref
import atexit import atexit
...@@ -161,6 +162,7 @@ class Finalize(object): ...@@ -161,6 +162,7 @@ class Finalize(object):
self._args = args self._args = args
self._kwargs = kwargs or {} self._kwargs = kwargs or {}
self._key = (exitpriority, next(_finalizer_counter)) self._key = (exitpriority, next(_finalizer_counter))
self._pid = os.getpid()
_finalizer_registry[self._key] = self _finalizer_registry[self._key] = self
...@@ -177,9 +179,13 @@ class Finalize(object): ...@@ -177,9 +179,13 @@ class Finalize(object):
except KeyError: except KeyError:
sub_debug('finalizer no longer registered') sub_debug('finalizer no longer registered')
else: else:
sub_debug('finalizer calling %s with args %s and kwargs %s', if self._pid != os.getpid():
self._callback, self._args, self._kwargs) sub_debug('finalizer ignored because different process')
res = self._callback(*self._args, **self._kwargs) res = None
else:
sub_debug('finalizer calling %s with args %s and kwargs %s',
self._callback, self._args, self._kwargs)
res = self._callback(*self._args, **self._kwargs)
self._weakref = self._callback = self._args = \ self._weakref = self._callback = self._args = \
self._kwargs = self._key = None self._kwargs = self._key = None
return res return res
......
...@@ -44,6 +44,9 @@ Core and Builtins ...@@ -44,6 +44,9 @@ Core and Builtins
Library Library
------- -------
- Issue #14548: Make multiprocessing finalizers check pid before
running to cope with possibility of gc running just after fork.
- Issue #14863: Update the documentation of os.fdopen() to reflect the - Issue #14863: Update the documentation of os.fdopen() to reflect the
fact that it's only a thin wrapper around open() anymore. fact that it's only a thin wrapper around open() anymore.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment