traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

asyncio: Fix the second half of issue #21447: race in _write_to_self().

This commit is contained in:
Guido van Rossum 2014-05-06 14:42:40 -07:00
parent 9fafc9f79a
commit 3d139d8ed6
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Lib/asyncio/selector_events.py
View File

@ -87,10 +87,17 @@ class BaseSelectorEventLoop(base_events.BaseEventLoop):
pass pass
def _write_to_self(self): def _write_to_self(self):
try: # This may be called from a different thread, possibly after
self._csock.send(b'x') # _close_self_pipe() has been called or even while it is
except (BlockingIOError, InterruptedError): # running. Guard for self._csock being None or closed. When
pass # a socket is closed, send() raises OSError (with errno set to
# EBADF, but let's not rely on the exact error code).
csock = self._csock
if csock is not None:
try:
csock.send(b'x')
except OSError:
pass
def _start_serving(self, protocol_factory, sock, def _start_serving(self, protocol_factory, sock,
sslcontext=None, server=None): sslcontext=None, server=None):

5
Lib/test/test_asyncio/test_selector_events.py
View File

@ -121,8 +121,9 @@ class BaseSelectorEventLoopTests(unittest.TestCase):
self.assertIsNone(self.loop._write_to_self()) self.assertIsNone(self.loop._write_to_self())
def test_write_to_self_exception(self): def test_write_to_self_exception(self):
self.loop._csock.send.side_effect = OSError() # _write_to_self() swallows OSError
self.assertRaises(OSError, self.loop._write_to_self) self.loop._csock.send.side_effect = RuntimeError()
self.assertRaises(RuntimeError, self.loop._write_to_self)
def test_sock_recv(self): def test_sock_recv(self):
sock = mock.Mock() sock = mock.Mock()