Commit1c06009

and

authored

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

* Restore running proactor event loop from non-main threadCo-Authored-By: Kyle Stanley <aeros167@gmail.com>

1 parent998cf1f commit1c06009Copy full SHA for 1c06009

File tree

+24

-1

lines changed

+24

-1

lines changed

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`	`importsocket`
`12`	`12`	`importwarnings`
`13`	`13`	`importsignal`
	`14`	`+importthreading`
`14`	`15`	`importcollections`
`15`	`16`
`16`	`17`	`from .importbase_events`
`@@ -627,7 +628,9 @@ def __init__(self, proactor):`
`627`	`628`	`proactor.set_loop(self)`
`628`	`629`	`self._make_self_pipe()`
`629`	`630`	`self_no=self._csock.fileno()`
`630`		`-signal.set_wakeup_fd(self_no)`
	`631`	`+ifthreading.current_thread()isthreading.main_thread():`
	`632`	`+# wakeup fd can only be installed to a file descriptor from the main thread`
	`633`	`+signal.set_wakeup_fd(self_no)`
`631`	`634`
`632`	`635`	`def_make_socket_transport(self,sock,protocol,waiter=None,`
`633`	`636`	`extra=None,server=None):`

Lines changed: 19 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,25 @@ def SIGINT_after_delay():`
`59`	`59`	`thread.join()`
`60`	`60`
`61`	`61`
	`62`	`+classProactorMultithreading(test_utils.TestCase):`
	`63`	`+deftest_run_from_nonmain_thread(self):`
	`64`	`+finished=False`
	`65`	`+`
	`66`	`+asyncdefcoro():`
	`67`	`+awaitasyncio.sleep(0)`
	`68`	`+`
	`69`	`+deffunc():`
	`70`	`+nonlocalfinished`
	`71`	`+loop=asyncio.new_event_loop()`
	`72`	`+loop.run_until_complete(coro())`
	`73`	`+finished=True`
	`74`	`+`
	`75`	`+thread=threading.Thread(target=func)`
	`76`	`+thread.start()`
	`77`	`+thread.join()`
	`78`	`+self.assertTrue(finished)`
	`79`	`+`
	`80`	`+`
`62`	`81`	`classProactorTests(test_utils.TestCase):`
`63`	`82`
`64`	`83`	`defsetUp(self):`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Restores instantiation of Windows IOCP event loops from the non-main thread.`

Comments

(0)