Skip to content

Commit

Permalink
pythongh-91577: SharedMemory move imports out of methods (pythonGH-91579
Browse files Browse the repository at this point in the history
)

SharedMemory.unlink() uses the unregister() function from resource_tracker. Previously it was imported in the method, but this can fail if the method is called during interpreter shutdown, for example when unlink is part of a __del__() method.

Moving the import to the top of the file, means that the unregister() method is available during interpreter shutdown.

The register call in SharedMemory.__init__() can also use this imported resource_tracker.
(cherry picked from commit 9a458be)

Co-authored-by: samtygier <samtygier@yahoo.co.uk>
  • Loading branch information
miss-islington and samtygier authored Jun 16, 2022
1 parent 62f72e4 commit 0c49a09
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
7 changes: 3 additions & 4 deletions Lib/multiprocessing/shared_memory.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import _posixshmem
_USE_POSIX = True

from . import resource_tracker

_O_CREX = os.O_CREAT | os.O_EXCL

Expand Down Expand Up @@ -116,8 +117,7 @@ def __init__(self, name=None, create=False, size=0):
self.unlink()
raise

from .resource_tracker import register
register(self._name, "shared_memory")
resource_tracker.register(self._name, "shared_memory")

else:

Expand Down Expand Up @@ -237,9 +237,8 @@ def unlink(self):
called once (and only once) across all processes which have access
to the shared memory block."""
if _USE_POSIX and self._name:
from .resource_tracker import unregister
_posixshmem.shm_unlink(self._name)
unregister(self._name, "shared_memory")
resource_tracker.unregister(self._name, "shared_memory")


_encoding = "utf8"
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Move imports in :class:`~multiprocessing.SharedMemory` methods to module level so that they can be executed late in python finalization.

0 comments on commit 0c49a09

Please sign in to comment.