Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
b1dfcad6
Commit
b1dfcad6
authored
May 13, 2019
by
Pierre Glaser
Committed by
Antoine Pitrou
May 13, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bpo-36867: Create the resource_tracker before launching SharedMemoryManagers (GH-13276)
parent
be6939fb
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
54 additions
and
14 deletions
+54
-14
Lib/multiprocessing/managers.py
Lib/multiprocessing/managers.py
+9
-0
Lib/test/_test_multiprocessing.py
Lib/test/_test_multiprocessing.py
+44
-14
Misc/NEWS.d/next/Library/2019-05-13-13-02-43.bpo-36867.Qh-6mX.rst
...S.d/next/Library/2019-05-13-13-02-43.bpo-36867.Qh-6mX.rst
+1
-0
No files found.
Lib/multiprocessing/managers.py
View file @
b1dfcad6
...
...
@@ -21,6 +21,7 @@ import signal
import
array
import
queue
import
time
import
os
from
os
import
getpid
from
traceback
import
format_exc
...
...
@@ -1349,6 +1350,14 @@ if HAS_SHMEM:
_Server
=
SharedMemoryServer
def
__init__
(
self
,
*
args
,
**
kwargs
):
if
os
.
name
==
"posix"
:
# bpo-36867: Ensure the resource_tracker is running before
# launching the manager process, so that concurrent
# shared_memory manipulation both in the manager and in the
# current process does not create two resource_tracker
# processes.
from
.
import
resource_tracker
resource_tracker
.
ensure_running
()
BaseManager
.
__init__
(
self
,
*
args
,
**
kwargs
)
util
.
debug
(
f"
{
self
.
__class__
.
__name__
}
created by pid
{
getpid
()
}
"
)
...
...
Lib/test/_test_multiprocessing.py
View file @
b1dfcad6
...
...
@@ -17,6 +17,7 @@ import array
import
socket
import
random
import
logging
import
subprocess
import
struct
import
operator
import
pickle
...
...
@@ -3765,6 +3766,27 @@ class _TestSharedMemory(BaseTestCase):
smm
.
shutdown
()
@
unittest
.
skipIf
(
os
.
name
!=
"posix"
,
"resource_tracker is posix only"
)
def
test_shared_memory_SharedMemoryManager_reuses_resource_tracker
(
self
):
# bpo-36867: test that a SharedMemoryManager uses the
# same resource_tracker process as its parent.
cmd
=
'''if 1:
from multiprocessing.managers import SharedMemoryManager
smm = SharedMemoryManager()
smm.start()
sl = smm.ShareableList(range(10))
smm.shutdown()
'''
rc
,
out
,
err
=
test
.
support
.
script_helper
.
assert_python_ok
(
'-c'
,
cmd
)
# Before bpo-36867 was fixed, a SharedMemoryManager not using the same
# resource_tracker process as its parent would make the parent's
# tracker complain about sl being leaked even though smm.shutdown()
# properly released sl.
self
.
assertFalse
(
err
)
def
test_shared_memory_SharedMemoryManager_basics
(
self
):
smm1
=
multiprocessing
.
managers
.
SharedMemoryManager
()
with
self
.
assertRaises
(
ValueError
):
...
...
@@ -3904,8 +3926,6 @@ class _TestSharedMemory(BaseTestCase):
sl
.
shm
.
close
()
def
test_shared_memory_cleaned_after_process_termination
(
self
):
import
subprocess
from
multiprocessing
import
shared_memory
cmd
=
'''if 1:
import os, time, sys
from multiprocessing import shared_memory
...
...
@@ -3916,18 +3936,29 @@ class _TestSharedMemory(BaseTestCase):
sys.stdout.flush()
time.sleep(100)
'''
p
=
subprocess
.
Popen
([
sys
.
executable
,
'-E'
,
'-c'
,
cmd
],
stdout
=
subprocess
.
PIPE
)
name
=
p
.
stdout
.
readline
().
strip
().
decode
()
with
subprocess
.
Popen
([
sys
.
executable
,
'-E'
,
'-c'
,
cmd
],
stdout
=
subprocess
.
PIPE
,
stderr
=
subprocess
.
PIPE
)
as
p
:
name
=
p
.
stdout
.
readline
().
strip
().
decode
()
# killing abruptly processes holding reference to a shared memory
# segment should not leak the given memory segment.
p
.
terminate
()
p
.
wait
()
time
.
sleep
(
1.0
)
# wait for the OS to collect the segment
# killing abruptly processes holding reference to a shared memory
# segment should not leak the given memory segment.
p
.
terminate
()
p
.
wait
()
time
.
sleep
(
1.0
)
# wait for the OS to collect the segment
with
self
.
assertRaises
(
FileNotFoundError
):
smm
=
shared_memory
.
SharedMemory
(
name
,
create
=
False
)
# The shared memory file was deleted.
with
self
.
assertRaises
(
FileNotFoundError
):
smm
=
shared_memory
.
SharedMemory
(
name
,
create
=
False
)
if
os
.
name
==
'posix'
:
# A warning was emitted by the subprocess' own
# resource_tracker (on Windows, shared memory segments
# are released automatically by the OS).
err
=
p
.
stderr
.
read
().
decode
()
self
.
assertIn
(
"resource_tracker: There appear to be 1 leaked "
"shared_memory objects to clean up at shutdown"
,
err
)
#
#
...
...
@@ -4560,7 +4591,7 @@ class TestFlags(unittest.TestCase):
print
(
json
.
dumps
(
flags
))
def
test_flags
(
self
):
import
json
,
subprocess
import
json
# start child process using unusual flags
prog
=
(
'from test._test_multiprocessing import TestFlags; '
+
'TestFlags.run_in_child()'
)
...
...
@@ -4866,7 +4897,6 @@ class TestResourceTracker(unittest.TestCase):
#
# Check that killing process does not leak named semaphores
#
import
subprocess
cmd
=
'''if 1:
import time, os, tempfile
import multiprocessing as mp
...
...
Misc/NEWS.d/next/Library/2019-05-13-13-02-43.bpo-36867.Qh-6mX.rst
0 → 100644
View file @
b1dfcad6
Fix a bug making a SharedMemoryManager instance and its parent process use two separate resource_tracker processes.
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment