bpo-41246: IOCP Proactor same socket overlapped callbacks

Lib/asyncio/windows_events.py

@@ -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)
@@ -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)
@@ -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)
@@ -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)
@@ -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)
@@ -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)

Misc/NEWS.d/next/Library/2020-07-08-20-32-13.bpo-41246.2trYf3.rst

@@ -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``.