summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormsoxzw <56633971+msoxzw@users.noreply.github.com>2022-04-15 19:59:01 (GMT)
committerGitHub <noreply@github.com>2022-04-15 19:59:01 (GMT)
commit42fabc3ea767f10989363536eaaa9da32616ab57 (patch)
tree6233bfa04fbe4ad6f367d2f4e05d0acb7553c006
parentc9e231de8551ab6d06c92dfa95033150e52d7f1f (diff)
downloadcpython-42fabc3ea767f10989363536eaaa9da32616ab57.zip
cpython-42fabc3ea767f10989363536eaaa9da32616ab57.tar.gz
cpython-42fabc3ea767f10989363536eaaa9da32616ab57.tar.bz2
gh-91487: Optimize asyncio UDP speed (GH-91488)
Fix #91487 When transferring a small file, e.g. 256 KiB, the speed of this PR is comparable. However, if a large file, e.g. 65536 KiB, is transferred, asyncio UDP will be over 100 times faster than the original. The speed is presumably significantly faster if a larger file is transferred, e.g. 1048576 KiB. Automerge-Triggered-By: GH:gpshead
-rw-r--r--Lib/asyncio/proactor_events.py5
-rw-r--r--Lib/asyncio/selector_events.py6
-rw-r--r--Misc/NEWS.d/next/Library/2022-04-15-19-34-02.gh-issue-91487.2aqguF.rst1
3 files changed, 10 insertions, 2 deletions
diff --git a/Lib/asyncio/proactor_events.py b/Lib/asyncio/proactor_events.py
index ff6d08f..9636c6b 100644
--- a/Lib/asyncio/proactor_events.py
+++ b/Lib/asyncio/proactor_events.py
@@ -459,6 +459,7 @@ class _ProactorDatagramTransport(_ProactorBasePipeTransport,
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)
@@ -471,7 +472,7 @@ class _ProactorDatagramTransport(_ProactorBasePipeTransport,
_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)
@@ -496,6 +497,7 @@ class _ProactorDatagramTransport(_ProactorBasePipeTransport,
# 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
@@ -522,6 +524,7 @@ class _ProactorDatagramTransport(_ProactorBasePipeTransport,
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)
diff --git a/Lib/asyncio/selector_events.py b/Lib/asyncio/selector_events.py
index e99a503..c9bbe2a 100644
--- a/Lib/asyncio/selector_events.py
+++ b/Lib/asyncio/selector_events.py
@@ -1131,6 +1131,7 @@ class _SelectorDatagramTransport(_SelectorTransport):
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,
@@ -1141,7 +1142,7 @@ class _SelectorDatagramTransport(_SelectorTransport):
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:
@@ -1200,11 +1201,13 @@ class _SelectorDatagramTransport(_SelectorTransport):
# 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)
@@ -1212,6 +1215,7 @@ class _SelectorDatagramTransport(_SelectorTransport):
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)
diff --git a/Misc/NEWS.d/next/Library/2022-04-15-19-34-02.gh-issue-91487.2aqguF.rst b/Misc/NEWS.d/next/Library/2022-04-15-19-34-02.gh-issue-91487.2aqguF.rst
new file mode 100644
index 0000000..d3c41a7
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2022-04-15-19-34-02.gh-issue-91487.2aqguF.rst
@@ -0,0 +1 @@
+Optimize asyncio UDP speed, over 100 times faster when transferring a large file.