[Python-checkins] bpo-36102: Prepend slash to all POSIX shared memory block names (#12036)

Mon Feb 25 17:41:55 EST 2019

https://github.com/python/cpython/commit/aadef2b41600cb6a4f845cdc4cea001c916d8745
commit: aadef2b41600cb6a4f845cdc4cea001c916d8745
branch: master
author: Davin Potts <applio at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2019年02月25日T16:41:52-06:00
summary:
bpo-36102: Prepend slash to all POSIX shared memory block names (#12036)
files:
M Lib/multiprocessing/shared_memory.py

diff --git a/Lib/multiprocessing/shared_memory.py b/Lib/multiprocessing/shared_memory.py
index e4fe822cc641..ebc88858762e 100644
--- a/Lib/multiprocessing/shared_memory.py
+++ b/Lib/multiprocessing/shared_memory.py
@@ -30,7 +30,7 @@
 
 # Shared memory block name prefix
 if _USE_POSIX:
- _SHM_NAME_PREFIX = 'psm_'
+ _SHM_NAME_PREFIX = '/psm_'
 else:
 _SHM_NAME_PREFIX = 'wnsm_'
 
@@ -68,6 +68,7 @@ class SharedMemory:
 _buf = None
 _flags = os.O_RDWR
 _mode = 0o600
+ _prepend_leading_slash = True if _USE_POSIX else False
 
 def __init__(self, name=None, create=False, size=0):
 if not size >= 0:
@@ -95,6 +96,7 @@ def __init__(self, name=None, create=False, size=0):
 self._name = name
 break
 else:
+ name = "/" + name if self._prepend_leading_slash else name
 self._fd = _posixshmem.shm_open(
 name,
 self._flags,
@@ -198,7 +200,11 @@ def buf(self):
 @property
 def name(self):
 "Unique name that identifies the shared memory block."
- return self._name
+ reported_name = self._name
+ if _USE_POSIX and self._prepend_leading_slash:
+ if self._name.startswith("/"):
+ reported_name = self._name[1:]
+ return reported_name
 
 @property
 def size(self):
@@ -224,8 +230,8 @@ def unlink(self):
 In order to ensure proper cleanup of resources, unlink should be
 called once (and only once) across all processes which have access
 to the shared memory block."""
- if _USE_POSIX and self.name:
- _posixshmem.shm_unlink(self.name)
+ if _USE_POSIX and self._name:
+ _posixshmem.shm_unlink(self._name)
 
 
 _encoding = "utf8"
