Skip to content

Commit

Permalink
bpo-34679: Restore instantiation Windows IOCP event loop from non-mai…
Browse files Browse the repository at this point in the history
…n thread (python#15492)

* Restore running proactor event loop from non-main thread

Co-Authored-By: Kyle Stanley <aeros167@gmail.com>
  • Loading branch information
asvetlov and aeros authored Aug 26, 2019
1 parent 998cf1f commit 1c06009
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 1 deletion.
5 changes: 4 additions & 1 deletion Lib/asyncio/proactor_events.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import socket
import warnings
import signal
import threading
import collections

from . import base_events
Expand Down Expand Up @@ -627,7 +628,9 @@ def __init__(self, proactor):
proactor.set_loop(self)
self._make_self_pipe()
self_no = self._csock.fileno()
signal.set_wakeup_fd(self_no)
if threading.current_thread() is threading.main_thread():
# wakeup fd can only be installed to a file descriptor from the main thread
signal.set_wakeup_fd(self_no)

def _make_socket_transport(self, sock, protocol, waiter=None,
extra=None, server=None):
Expand Down
19 changes: 19 additions & 0 deletions Lib/test/test_asyncio/test_windows_events.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,25 @@ def SIGINT_after_delay():
thread.join()


class ProactorMultithreading(test_utils.TestCase):
def test_run_from_nonmain_thread(self):
finished = False

async def coro():
await asyncio.sleep(0)

def func():
nonlocal finished
loop = asyncio.new_event_loop()
loop.run_until_complete(coro())
finished = True

thread = threading.Thread(target=func)
thread.start()
thread.join()
self.assertTrue(finished)


class ProactorTests(test_utils.TestCase):

def setUp(self):
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Restores instantiation of Windows IOCP event loops from the non-main thread.

0 comments on commit 1c06009

Please sign in to comment.