[Python-checkins] cpython (3.4): asyncio, Tulip issue 204: Fix IocpProactor.recv()

Mon Jan 26 22:32:34 CET 2015

https://hg.python.org/cpython/rev/9532923cbf2b
changeset: 94324:9532923cbf2b
branch: 3.4
user: Victor Stinner <victor.stinner at gmail.com>
date: Mon Jan 26 22:30:49 2015 +0100
summary:
 asyncio, Tulip issue 204: Fix IocpProactor.recv()
If ReadFile() fails with ERROR_BROKEN_PIPE, the operation is not pending: don't
register the overlapped.
I don't know if WSARecv() can fail with ERROR_BROKEN_PIPE. Since
Overlapped.WSARecv() already handled ERROR_BROKEN_PIPE, let me guess that it
has the same behaviour than ReadFile().
files:
 Lib/asyncio/windows_events.py | 20 +++++++++++++-------
 Modules/overlapped.c | 4 ++--
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/Lib/asyncio/windows_events.py b/Lib/asyncio/windows_events.py
--- a/Lib/asyncio/windows_events.py
+++ b/Lib/asyncio/windows_events.py
@@ -406,13 +406,21 @@
 self._results = []
 return tmp
 
+ def _result(self, value):
+ fut = futures.Future(loop=self._loop)
+ fut.set_result(value)
+ return fut
+
 def recv(self, conn, nbytes, flags=0):
 self._register_with_iocp(conn)
 ov = _overlapped.Overlapped(NULL)
- if isinstance(conn, socket.socket):
- ov.WSARecv(conn.fileno(), nbytes, flags)
- else:
- ov.ReadFile(conn.fileno(), nbytes)
+ try:
+ if isinstance(conn, socket.socket):
+ ov.WSARecv(conn.fileno(), nbytes, flags)
+ else:
+ ov.ReadFile(conn.fileno(), nbytes)
+ except BrokenPipeError:
+ return self._result(b'')
 
 def finish_recv(trans, key, ov):
 try:
@@ -505,9 +513,7 @@
 # ConnectNamePipe() failed with ERROR_PIPE_CONNECTED which means
 # that the pipe is connected. There is no need to wait for the
 # completion of the connection.
- f = futures.Future(loop=self._loop)
- f.set_result(pipe)
- return f
+ return self._result(pipe)
 
 def finish_accept_pipe(trans, key, ov):
 ov.getresult()
diff --git a/Modules/overlapped.c b/Modules/overlapped.c
--- a/Modules/overlapped.c
+++ b/Modules/overlapped.c
@@ -730,7 +730,7 @@
 switch (err) {
 case ERROR_BROKEN_PIPE:
 mark_as_completed(&self->overlapped);
- Py_RETURN_NONE;
+ return SetFromWindowsErr(err);
 case ERROR_SUCCESS:
 case ERROR_MORE_DATA:
 case ERROR_IO_PENDING:
@@ -789,7 +789,7 @@
 switch (err) {
 case ERROR_BROKEN_PIPE:
 mark_as_completed(&self->overlapped);
- Py_RETURN_NONE;
+ return SetFromWindowsErr(err);
 case ERROR_SUCCESS:
 case ERROR_MORE_DATA:
 case ERROR_IO_PENDING:
-- 
Repository URL: https://hg.python.org/cpython
