Skip to content

gh-91487: Optimize asyncio UDP speed #91488

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
merged 3 commits into from
Apr 15, 2022
Merged

gh-91487: Optimize asyncio UDP speed #91488

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bd37f2f
Optimize asyncio UDP speed for proactor events
msoxzw Apr 12, 2022
1fe6180
Optimize asyncio UDP speed for selector events
msoxzw Apr 12, 2022
985739d
📜🤖 Added by blurb_it.
blurb-it[bot] Apr 15, 2022
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
5 changes: 4 additions & 1 deletion Lib/asyncio/proactor_events.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -459,6 +459,7 @@ def __init__(self, loop, sock, protocol, address=None,
waiter=None, extra=None):
self._address = address
self._empty_waiter = None
self._buffer_size = 0
# We don't need to call _protocol.connection_made() since our base
# constructor does it for us.
super().__init__(loop, sock, protocol, waiter=waiter, extra=extra)
Expand All @@ -471,7 +472,7 @@ def _set_extra(self, sock):
_set_socket_extra(self, sock)

def get_write_buffer_size(self):
return sum(len(data) for data, _ in self._buffer)
return self._buffer_size

def abort(self):
self._force_close(None)
Expand All @@ -496,6 +497,7 @@ def sendto(self, data, addr=None):

# Ensure that what we buffer is immutable.
self._buffer.append((bytes(data), addr))
self._buffer_size += len(data)

if self._write_fut is None:
# No current write operations are active, kick one off
Expand All @@ -522,6 +524,7 @@ def _loop_writing(self, fut=None):
return

data, addr = self._buffer.popleft()
self._buffer_size -= len(data)
if self._address is not None:
self._write_fut = self._loop._proactor.send(self._sock,
data)
Expand Down
6 changes: 5 additions & 1 deletion Lib/asyncio/selector_events.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1131,6 +1131,7 @@ def __init__(self, loop, sock, protocol, address=None,
waiter=None, extra=None):
super().__init__(loop, sock, protocol, extra)
self._address = address
self._buffer_size = 0
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 All @@ -1141,7 +1142,7 @@ def __init__(self, loop, sock, protocol, address=None,
waiter, None)

def get_write_buffer_size(self):
return sum(len(data) for data, _ in self._buffer)
return self._buffer_size

def _read_ready(self):
if self._conn_lost:
Expand Down Expand Up @@ -1200,18 +1201,21 @@ def sendto(self, data, addr=None):

# Ensure that what we buffer is immutable.
self._buffer.append((bytes(data), addr))
self._buffer_size += len(data)
self._maybe_pause_protocol()

def _sendto_ready(self):
while self._buffer:
data, addr = self._buffer.popleft()
self._buffer_size -= len(data)
try:
if self._extra['peername']:
self._sock.send(data)
else:
self._sock.sendto(data, addr)
except (BlockingIOError, InterruptedError):
self._buffer.appendleft((data, addr)) # Try again later.
self._buffer_size += len(data)
break
except OSError as exc:
self._protocol.error_received(exc)
Expand Down
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Library/2022-04-15-19-34-02.gh-issue-91487.2aqguF.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Optimize asyncio UDP speed, over 100 times faster when transferring a large file.