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

Merge 3.4 (asyncio)

This commit is contained in:
Victor Stinner 2015-01-26 22:31:03 +01:00
parent 5474d0ba19 41063d2a59
commit c27a8afcb0
2 changed files with 32 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
Lib/asyncio/windows_events.py
View File

@ -126,14 +126,12 @@ class _BaseWaitHandleFuture(futures.Future):
return return
self._registered = False self._registered = False
wait_handle = self._wait_handle
self._wait_handle = None
try: try:
_overlapped.UnregisterWait(self._wait_handle) _overlapped.UnregisterWait(wait_handle)
except OSError as exc: except OSError as exc:
self._wait_handle = None if exc.winerror != _overlapped.ERROR_IO_PENDING:
if exc.winerror == _overlapped.ERROR_IO_PENDING:
# ERROR_IO_PENDING is not an error, the wait was unregistered
self._unregister_wait_cb(None)
elif exc.winerror != _overlapped.ERROR_IO_PENDING:
context = { context = {
'message': 'Failed to unregister the wait handle', 'message': 'Failed to unregister the wait handle',
'exception': exc, 'exception': exc,
@ -142,9 +140,10 @@ class _BaseWaitHandleFuture(futures.Future):
if self._source_traceback: if self._source_traceback:
context['source_traceback'] = self._source_traceback context['source_traceback'] = self._source_traceback
self._loop.call_exception_handler(context) self._loop.call_exception_handler(context)
else: return
self._wait_handle = None # ERROR_IO_PENDING means that the unregister is pending
self._unregister_wait_cb(None)
self._unregister_wait_cb(None)
def cancel(self): def cancel(self):
self._unregister_wait() self._unregister_wait()
@ -209,14 +208,12 @@ class _WaitHandleFuture(_BaseWaitHandleFuture):
return return
self._registered = False self._registered = False
wait_handle = self._wait_handle
self._wait_handle = None
try: try:
_overlapped.UnregisterWaitEx(self._wait_handle, self._event) _overlapped.UnregisterWaitEx(wait_handle, self._event)
except OSError as exc: except OSError as exc:
self._wait_handle = None if exc.winerror != _overlapped.ERROR_IO_PENDING:
if exc.winerror == _overlapped.ERROR_IO_PENDING:
# ERROR_IO_PENDING is not an error, the wait was unregistered
self._unregister_wait_cb(None)
elif exc.winerror != _overlapped.ERROR_IO_PENDING:
context = { context = {
'message': 'Failed to unregister the wait handle', 'message': 'Failed to unregister the wait handle',
'exception': exc, 'exception': exc,
@ -225,11 +222,11 @@ class _WaitHandleFuture(_BaseWaitHandleFuture):
if self._source_traceback: if self._source_traceback:
context['source_traceback'] = self._source_traceback context['source_traceback'] = self._source_traceback
self._loop.call_exception_handler(context) self._loop.call_exception_handler(context)
else: return
self._wait_handle = None # ERROR_IO_PENDING is not an error, the wait was unregistered
self._event_fut = self._proactor._wait_cancel(
self._event, self._event_fut = self._proactor._wait_cancel(self._event,
self._unregister_wait_cb) self._unregister_wait_cb)
class PipeServer(object): class PipeServer(object):
@ -409,13 +406,21 @@ class IocpProactor:
self._results = [] self._results = []
return tmp 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): def recv(self, conn, nbytes, flags=0):
self._register_with_iocp(conn) self._register_with_iocp(conn)
ov = _overlapped.Overlapped(NULL) ov = _overlapped.Overlapped(NULL)
if isinstance(conn, socket.socket): try:
ov.WSARecv(conn.fileno(), nbytes, flags) if isinstance(conn, socket.socket):
else: ov.WSARecv(conn.fileno(), nbytes, flags)
ov.ReadFile(conn.fileno(), nbytes) else:
ov.ReadFile(conn.fileno(), nbytes)
except BrokenPipeError:
return self._result(b'')
def finish_recv(trans, key, ov): def finish_recv(trans, key, ov):
try: try:
@ -508,9 +513,7 @@ class IocpProactor:
# ConnectNamePipe() failed with ERROR_PIPE_CONNECTED which means # ConnectNamePipe() failed with ERROR_PIPE_CONNECTED which means
# that the pipe is connected. There is no need to wait for the # that the pipe is connected. There is no need to wait for the
# completion of the connection. # completion of the connection.
f = futures.Future(loop=self._loop) return self._result(pipe)
f.set_result(pipe)
return f
def finish_accept_pipe(trans, key, ov): def finish_accept_pipe(trans, key, ov):
ov.getresult() ov.getresult()

4
Modules/overlapped.c
View File

@ -730,7 +730,7 @@ Overlapped_ReadFile(OverlappedObject *self, PyObject *args)
switch (err) { switch (err) {
case ERROR_BROKEN_PIPE: case ERROR_BROKEN_PIPE:
mark_as_completed(&self->overlapped); mark_as_completed(&self->overlapped);
Py_RETURN_NONE; return SetFromWindowsErr(err);
case ERROR_SUCCESS: case ERROR_SUCCESS:
case ERROR_MORE_DATA: case ERROR_MORE_DATA:
case ERROR_IO_PENDING: case ERROR_IO_PENDING:
@ -789,7 +789,7 @@ Overlapped_WSARecv(OverlappedObject *self, PyObject *args)
switch (err) { switch (err) {
case ERROR_BROKEN_PIPE: case ERROR_BROKEN_PIPE:
mark_as_completed(&self->overlapped); mark_as_completed(&self->overlapped);
Py_RETURN_NONE; return SetFromWindowsErr(err);
case ERROR_SUCCESS: case ERROR_SUCCESS:
case ERROR_MORE_DATA: case ERROR_MORE_DATA:
case ERROR_IO_PENDING: case ERROR_IO_PENDING: