bpo-34679: Restore instantiation Windows IOCP event loop from non-main thread (GH-15492)

* Restore running proactor event loop from non-main thread

Co-Authored-By: Kyle Stanley <aeros167@gmail.com>
(cherry picked from commit 1c06009986)

Co-authored-by: Andrew Svetlov <andrew.svetlov@gmail.com>
This commit is contained in:
Miss Islington (bot) 2019-08-26 03:14:54 -07:00 committed by GitHub
parent 522a394a72
commit 69d22b8fee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 24 additions and 1 deletions

View File

@ -11,6 +11,7 @@ import os
import socket
import warnings
import signal
import threading
import collections
from . import base_events
@ -627,7 +628,9 @@ class BaseProactorEventLoop(base_events.BaseEventLoop):
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):

View File

@ -59,6 +59,25 @@ class ProactorLoopCtrlC(test_utils.TestCase):
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):

View File

@ -0,0 +1 @@
Restores instantiation of Windows IOCP event loops from the non-main thread.