Skip to content

Commit

Permalink
bpo-22087: Fix Policy.get_event_loop() to detect fork and return a ne…
Browse files Browse the repository at this point in the history
…w loop.

Original patch by Dan O'Reilly.
  • Loading branch information
1st1 committed May 29, 2018
1 parent 4fadf0c commit 15bc6d2
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 0 deletions.
7 changes: 7 additions & 0 deletions Lib/asyncio/events.py
Original file line number Diff line number Diff line change
Expand Up @@ -625,16 +625,23 @@ class BaseDefaultEventLoopPolicy(AbstractEventLoopPolicy):

class _Local(threading.local):
_loop = None
_pid = None
_set_called = False

def __init__(self):
self._local = self._Local()
self._local._pid = os.getpid()

def get_event_loop(self):
"""Get the event loop.
This may be None or an instance of EventLoop.
"""
if self._local._pid != os.getpid():
# If we detect we're in a child process forked by multiprocessing,
# we reset self._local so that we'll get a new event loop.
self._local = self._Local()

if (self._local._loop is None and
not self._local._set_called and
isinstance(threading.current_thread(), threading._MainThread)):
Expand Down
21 changes: 21 additions & 0 deletions Lib/test/test_asyncio/test_unix_events.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import tempfile
import threading
import unittest
import multiprocessing
from unittest import mock
from test import support

Expand Down Expand Up @@ -1804,6 +1805,26 @@ def create_watcher(self):
return asyncio.FastChildWatcher()


class ForkedProcessTests(unittest.TestCase):
def setUp(self):
self.parent_loop = asyncio.SelectorEventLoop()
asyncio.set_event_loop(self.parent_loop)
self.ctx = multiprocessing.get_context("fork")

def _check_loops_not_equal(self, old_loop):
loop = asyncio.get_event_loop()
sys.exit(loop is old_loop)

def test_new_loop_in_child(self):
p = self.ctx.Process(target=self._check_loops_not_equal,
args=(self.parent_loop,))
p.start()
p.join()
self.assertEqual(p.exitcode, 0,
"Child process inherited parent's event loop")
self.parent_loop.close()


class PolicyTests(unittest.TestCase):

def create_policy(self):
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Fix Policy.get_event_loop() to detect fork and return a new loop.

Original patch by Dan O'Reilly.

0 comments on commit 15bc6d2

Please sign in to comment.