Uh oh!
There was an error while loading. Please reload this page.
Uh oh!
There was an error while loading. Please reload this page.
- Notifications
You must be signed in to change notification settings - Fork 35.2k
bpo-36888: Add multiprocessing.parent_process()#13247
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Uh oh!
There was an error while loading. Please reload this page.
Merged
Changes from all commits
Commits
Show all changes
25 commits
Select commit
Hold shift + click to select a range
8839770
ENH add parent_process in multiprocessing contexts
tomMoral bcdba73
FIX avoid error in Process.__repr__
pierreglaser 98de001
CLN more logical attribute naming
pierreglaser 9b67034
ENH implement ParentProcess.is_alive
pierreglaser 23a2f3d
FIX pass parent_name to ParentProcess
pierreglaser 5630de5
do not use current_process to create ParentProcess
pierreglaser be73255
TST test parent_process use-cases
pierreglaser faa3fb8
FIX do not close parent_sentinel on windows
pierreglaser cd2f241
FIX implement ParentProcess on windows
pierreglaser 3d71d3f
MNT news entry
pierreglaser 0ceffc8
FIX _main for forkserver
pierreglaser 9382659
TST better tests
pierreglaser 95dfc61
ENH use narrower permissions on windows
pierreglaser 29898b5
FIX duplicate sentinel when necessary
pierreglaser 566db0e
ENH listen to read end of a pipe in fork
pierreglaser a2310a7
FIX duplicate the parent sentinel in forkserver
pierreglaser b3829f6
ENH access parent_process from multiprocessing
pierreglaser 133df9c
TST improve test coverage and readability
pierreglaser 3c5d241
FIX pass correct fd to spawn on windows
pierreglaser 4fe8467
DOC docs
pierreglaser a9c987c
CLN duplicate fd instead of not closing it
pierreglaser e23cc08
address review comments
pierreglaser 7293d4c
FIX pass timeout correctly
pierreglaser 80dcabf
address review comments
pierreglaser 32aa640
CLN unnecessary attribute
pierreglaser File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading. Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading. Please reload this page.
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -7,7 +7,8 @@ | ||
| # Licensed to PSF under a Contributor Agreement. | ||
| # | ||
| __all__ = ['BaseProcess', 'current_process', 'active_children'] | ||
| __all__ = ['BaseProcess', 'current_process', 'active_children', | ||
| 'parent_process'] | ||
| # | ||
| # Imports | ||
| @@ -46,6 +47,13 @@ def active_children(): | ||
| _cleanup() | ||
| return list(_children) | ||
| def parent_process(): | ||
| ''' | ||
| Return process object representing the parent process | ||
| ''' | ||
| return _parent_process | ||
| # | ||
| # | ||
| # | ||
| @@ -76,6 +84,7 @@ def __init__(self, group=None, target=None, name=None, args=(), kwargs={}, | ||
| self._identity = _current_process._identity + (count,) | ||
| self._config = _current_process._config.copy() | ||
| self._parent_pid = os.getpid() | ||
| self._parent_name = _current_process.name | ||
| self._popen = None | ||
| self._closed = False | ||
| self._target = target | ||
| @@ -278,9 +287,9 @@ def __repr__(self): | ||
| ## | ||
| def _bootstrap(self): | ||
| def _bootstrap(self, parent_sentinel=None): | ||
| from . import util, context | ||
| global _current_process, _process_counter, _children | ||
| global _current_process, _parent_process, _process_counter, _children | ||
| try: | ||
| if self._start_method is not None: | ||
| @@ -290,6 +299,8 @@ def _bootstrap(self): | ||
| util._close_stdin() | ||
| old_process = _current_process | ||
| _current_process = self | ||
| _parent_process = _ParentProcess( | ||
| self._parent_name, self._parent_pid, parent_sentinel) | ||
| try: | ||
| util._finalizer_registry.clear() | ||
| util._run_after_forkers() | ||
| @@ -337,6 +348,40 @@ def __reduce__(self): | ||
| ) | ||
| return AuthenticationString, (bytes(self),) | ||
| # | ||
| # Create object representing the parent process | ||
| # | ||
| class _ParentProcess(BaseProcess): | ||
| def __init__(self, name, pid, sentinel): | ||
| self._identity = () | ||
| self._name = name | ||
| self._pid = pid | ||
| self._parent_pid = None | ||
| self._popen = None | ||
| self._closed = False | ||
| self._sentinel = sentinel | ||
| self._config = {} | ||
| def is_alive(self): | ||
pitrou marked this conversation as resolved.
Uh oh!There was an error while loading. Please reload this page. | ||
| from multiprocessing.connection import wait | ||
| return not wait([self._sentinel], timeout=0) | ||
| @property | ||
| def ident(self): | ||
| return self._pid | ||
| def join(self, timeout=None): | ||
| ''' | ||
| Wait until parent process terminates | ||
| ''' | ||
| from multiprocessing.connection import wait | ||
| wait([self._sentinel], timeout=timeout) | ||
| pid = ident | ||
| # | ||
| # Create object representing the main process | ||
| # | ||
| @@ -365,6 +410,7 @@ def close(self): | ||
| pass | ||
| _parent_process = None | ||
| _current_process = _MainProcess() | ||
| _process_counter = itertools.count(1) | ||
| _children = set() | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -269,6 +269,64 @@ def _test(cls, q, *args, **kwds): | ||
| q.put(bytes(current.authkey)) | ||
| q.put(current.pid) | ||
| def test_parent_process_attributes(self): | ||
| if self.TYPE == "threads": | ||
| self.skipTest('test not appropriate for {}'.format(self.TYPE)) | ||
| self.assertIsNone(self.parent_process()) | ||
| rconn, wconn = self.Pipe(duplex=False) | ||
| p = self.Process(target=self._test_send_parent_process, args=(wconn,)) | ||
| p.start() | ||
| p.join() | ||
| parent_pid, parent_name = rconn.recv() | ||
| self.assertEqual(parent_pid, self.current_process().pid) | ||
| self.assertEqual(parent_pid, os.getpid()) | ||
| self.assertEqual(parent_name, self.current_process().name) | ||
| @classmethod | ||
| def _test_send_parent_process(cls, wconn): | ||
| from multiprocessing.process import parent_process | ||
| wconn.send([parent_process().pid, parent_process().name]) | ||
| def test_parent_process(self): | ||
| if self.TYPE == "threads": | ||
| self.skipTest('test not appropriate for {}'.format(self.TYPE)) | ||
| # Launch a child process. Make it launch a grandchild process. Kill the | ||
| # child process and make sure that the grandchild notices the death of | ||
| # its parent (a.k.a the child process). | ||
| rconn, wconn = self.Pipe(duplex=False) | ||
| p = self.Process( | ||
| target=self._test_create_grandchild_process, args=(wconn, )) | ||
| p.start() | ||
| if not rconn.poll(timeout=5): | ||
| raise AssertionError("Could not communicate with child process") | ||
| parent_process_status = rconn.recv() | ||
| self.assertEqual(parent_process_status, "alive") | ||
| p.terminate() | ||
| p.join() | ||
| if not rconn.poll(timeout=5): | ||
| raise AssertionError("Could not communicate with child process") | ||
| parent_process_status = rconn.recv() | ||
| self.assertEqual(parent_process_status, "not alive") | ||
| @classmethod | ||
| def _test_create_grandchild_process(cls, wconn): | ||
| p = cls.Process(target=cls._test_report_parent_status, args=(wconn, )) | ||
tomMoral marked this conversation as resolved.
Uh oh!There was an error while loading. Please reload this page. | ||
| p.start() | ||
| time.sleep(100) | ||
| @classmethod | ||
| def _test_report_parent_status(cls, wconn): | ||
| from multiprocessing.process import parent_process | ||
| wconn.send("alive" if parent_process().is_alive() else "not alive") | ||
| parent_process().join(timeout=5) | ||
| wconn.send("alive" if parent_process().is_alive() else "not alive") | ||
| def test_process(self): | ||
| q = self.Queue(1) | ||
| e = self.Event() | ||
| @@ -5390,6 +5448,7 @@ class ProcessesMixin(BaseMixin): | ||
| Process = multiprocessing.Process | ||
| connection = multiprocessing.connection | ||
| current_process = staticmethod(multiprocessing.current_process) | ||
| parent_process = staticmethod(multiprocessing.parent_process) | ||
| active_children = staticmethod(multiprocessing.active_children) | ||
| Pool = staticmethod(multiprocessing.Pool) | ||
| Pipe = staticmethod(multiprocessing.Pipe) | ||
2 changes: 2 additions & 0 deletions
2 Misc/NEWS.d/next/Library/2019-05-16-18-02-08.bpo-36888.-H2Dkm.rst
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| Python child processes can now access the status of their parent process | ||
| using multiprocessing.process.parent_process |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.