Thanks to visit codestin.com
Credit goes to github.com

Skip to content

bpo-46194: Make selector inherit asyncio.DatagramTransport #30291

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.

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

Closed
wants to merge 8 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
97 changes: 91 additions & 6 deletions Lib/asyncio/selector_events.py
Original file line number Diff line number Diff line change
Expand Up @@ -744,9 +744,6 @@ def _call_connection_lost(self, exc):
server._detach()
self._server = None

def get_write_buffer_size(self):
return len(self._buffer)

def _add_reader(self, fd, callback, *args):
if self._closing:
return
Expand Down Expand Up @@ -895,6 +892,9 @@ def _read_ready__on_eof(self):
else:
self.close()

def get_write_buffer_size(self):
return len(self._buffer)

def write(self, data):
if not isinstance(data, (bytes, bytearray, memoryview)):
raise TypeError(f'data argument must be a bytes-like object, '
Expand Down Expand Up @@ -992,14 +992,32 @@ def _reset_empty_waiter(self):
self._empty_waiter = None


class _SelectorDatagramTransport(_SelectorTransport):
class _SelectorDatagramTransport(transports._FlowControlMixin,
transports.DatagramTransport):

_buffer_factory = collections.deque
max_size = 256 * 1024

def __init__(self, loop, sock, protocol, address=None,
waiter=None, extra=None):
super().__init__(loop, sock, protocol, extra)
waiter=None, extra=None, server=None):
super().__init__(loop=loop, extra=extra)
self._address = address
self._loop = loop
self._protocol = protocol
self._sock = sock
self._sock_fd = sock.fileno()
self._buffer = self._buffer_factory()
self._server = server
self._conn_lost = 0
self._closing = False
self._protocol_connected = False

if 'peername' not in self._extra:
try:
self._extra['peername'] = sock.getpeername()
except socket.error:
self._extra['peername'] = None

self._loop.call_soon(self._protocol.connection_made, self)
# only start reading when connection_made() has been called
self._loop.call_soon(self._add_reader,
Expand Down Expand Up @@ -1097,3 +1115,70 @@ def _sendto_ready(self):
self._loop._remove_writer(self._sock_fd)
if self._closing:
self._call_connection_lost(None)

def _add_reader(self, fd, callback, *args):
self._check_closed()
handle = events.Handle(callback, args, self, None)
try:
key = self._selector.get_key(fd)
except KeyError:
self._selector.register(fd, selectors.EVENT_READ,
(handle, None))
else:
mask, (reader, writer) = key.events, key.data
self._selector.modify(fd, mask | selectors.EVENT_READ,
(handle, writer))
if reader is not None:
reader.cancel()
return handle

def _fatal_error(self, exc, message='Fatal error on transport'):
# Should be called from exception handler only.
if isinstance(exc, OSError):
if self._loop.get_debug():
logger.debug("%r: %s", self, message, exc_info=True)
else:
self._loop.call_exception_handler({
'message': message,
'exception': exc,
'transport': self,
'protocol': self._protocol,
})
self._force_close(exc)

def _force_close(self, exc):
if self._conn_lost:
return
if self._buffer:
self._buffer.clear()
self._loop._remove_writer(self._sock_fd)
if not self._closing:
self._closing = True
self._loop._remove_reader(self._sock_fd)
self._conn_lost += 1
self._loop.call_soon(self._call_connection_lost, exc)

def _call_connection_lost(self, exc):
try:
if self._protocol_connected:
self._protocol.connection_lost(exc)
finally:
self._sock.close()
self._sock = None
self._protocol = None
self._loop = None
server = self._server
if server is not None:
server._detach()
self._server = None

def close(self):
if self._closing:
return
self._closing = True
self._loop._remove_reader(self._sock_fd)
if not self._buffer:
self._conn_lost += 1
self._loop._remove_writer(self._sock_fd)
self._loop.call_soon(self._call_connection_lost, None)

4 changes: 4 additions & 0 deletions Lib/test/test_asyncio/test_selector_events.py
Original file line number Diff line number Diff line change
Expand Up @@ -1089,6 +1089,10 @@ def datagram_transport(self, address=None):
self.addCleanup(close_transport, transport)
return transport

def test_isinstance_datagram_transport(self):
transport = self.datagram_transport()
self.assertIsInstance(transport, asyncio.DatagramTransport)

def test_read_ready(self):
transport = self.datagram_transport()

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Internal implementation of selector-based datagram transport inherits :class:`asyncio.DatagramTransport`.