FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

bpo-41246: IOCP Proactor same socket overlapped callbacks by tontinton · Pull Request #21399 · python/cpython · GitHub

  1. python
  2. cpython

Repository navigation

bpo-41246: IOCP Proactor same socket overlapped callbacks #21399

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gvanrossum merged 1 commit into from
Oct 13, 2022
Conversation 1 Commits 1 Checks 0 Files changed
Merged

bpo-41246: IOCP Proactor same socket overlapped callbacks #21399

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension .py  (1) .rst  (1) All 2 file types selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
82 changes: 17 additions & 65 deletions Lib/asyncio/windows_events.py
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -437,6 +437,17 @@ def _result(self, value):
fut.set_result(value)
return fut

@staticmethod
def finish_socket_func(trans, key, ov):
try:
return ov.getresult()
except OSError as exc:
if exc.winerror in (_overlapped.ERROR_NETNAME_DELETED,
_overlapped.ERROR_OPERATION_ABORTED):
raise ConnectionResetError(*exc.args)
else:
raise

def recv(self, conn, nbytes, flags=0):
self._register_with_iocp(conn)
ov = _overlapped.Overlapped(NULL)
Expand All @@ -448,17 +459,7 @@ def recv(self, conn, nbytes, flags=0):
except BrokenPipeError:
return self._result(b'')

def finish_recv(trans, key, ov):
try:
return ov.getresult()
except OSError as exc:
if exc.winerror in (_overlapped.ERROR_NETNAME_DELETED,
_overlapped.ERROR_OPERATION_ABORTED):
raise ConnectionResetError(*exc.args)
else:
raise

return self._register(ov, conn, finish_recv)
return self._register(ov, conn, self.finish_socket_func)

def recv_into(self, conn, buf, flags=0):
self._register_with_iocp(conn)
Expand All @@ -471,17 +472,7 @@ def recv_into(self, conn, buf, flags=0):
except BrokenPipeError:
return self._result(b'')

def finish_recv(trans, key, ov):
try:
return ov.getresult()
except OSError as exc:
if exc.winerror in (_overlapped.ERROR_NETNAME_DELETED,
_overlapped.ERROR_OPERATION_ABORTED):
raise ConnectionResetError(*exc.args)
else:
raise

return self._register(ov, conn, finish_recv)
return self._register(ov, conn, self.finish_socket_func)

def recvfrom(self, conn, nbytes, flags=0):
self._register_with_iocp(conn)
Expand All @@ -491,35 +482,15 @@ def recvfrom(self, conn, nbytes, flags=0):
except BrokenPipeError:
return self._result((b'', None))

def finish_recv(trans, key, ov):
try:
return ov.getresult()
except OSError as exc:
if exc.winerror in (_overlapped.ERROR_NETNAME_DELETED,
_overlapped.ERROR_OPERATION_ABORTED):
raise ConnectionResetError(*exc.args)
else:
raise

return self._register(ov, conn, finish_recv)
return self._register(ov, conn, self.finish_socket_func)

def sendto(self, conn, buf, flags=0, addr=None):
self._register_with_iocp(conn)
ov = _overlapped.Overlapped(NULL)

ov.WSASendTo(conn.fileno(), buf, flags, addr)

def finish_send(trans, key, ov):
try:
return ov.getresult()
except OSError as exc:
if exc.winerror in (_overlapped.ERROR_NETNAME_DELETED,
_overlapped.ERROR_OPERATION_ABORTED):
raise ConnectionResetError(*exc.args)
else:
raise

return self._register(ov, conn, finish_send)
return self._register(ov, conn, self.finish_socket_func)

def send(self, conn, buf, flags=0):
self._register_with_iocp(conn)
Expand All @@ -529,17 +500,7 @@ def send(self, conn, buf, flags=0):
else:
ov.WriteFile(conn.fileno(), buf)

def finish_send(trans, key, ov):
try:
return ov.getresult()
except OSError as exc:
if exc.winerror in (_overlapped.ERROR_NETNAME_DELETED,
_overlapped.ERROR_OPERATION_ABORTED):
raise ConnectionResetError(*exc.args)
else:
raise

return self._register(ov, conn, finish_send)
return self._register(ov, conn, self.finish_socket_func)

def accept(self, listener):
self._register_with_iocp(listener)
Expand Down Expand Up @@ -610,16 +571,7 @@ def sendfile(self, sock, file, offset, count):
offset_low, offset_high,
count, 0, 0)

def finish_sendfile(trans, key, ov):
try:
return ov.getresult()
except OSError as exc:
if exc.winerror in (_overlapped.ERROR_NETNAME_DELETED,
_overlapped.ERROR_OPERATION_ABORTED):
raise ConnectionResetError(*exc.args)
else:
raise
return self._register(ov, sock, finish_sendfile)
return self._register(ov, sock, self.finish_socket_func)

def accept_pipe(self, pipe):
self._register_with_iocp(pipe)
Expand Down
3 changes: 3 additions & 0 deletions Misc/NEWS.d/next/Library/2020-07-08-20-32-13.bpo-41246.2trYf3.rst
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Give the same callback function for when the overlapped operation is done to
the functions ``recv``, ``recv_into``, ``recvfrom``, ``sendto``, ``send``
and ``sendfile`` inside ``IocpProactor``.
Back | FazBrowse Home | New Git URL