diff options
author | Antoine Pitrou <solipsis@pitrou.net> | 2014-02-08 23:03:56 +0100 |
---|---|---|
committer | Antoine Pitrou <solipsis@pitrou.net> | 2014-02-08 23:03:56 +0100 |
commit | 59dbb9ae23f695997a6199829e969918720ff3c9 (patch) | |
tree | 0a6d46b341c78c808d69140b9a79b866e5831488 /Lib/multiprocessing | |
parent | 38199912bf04bfca6388849556cf3404ff138dbe (diff) | |
download | cpython-59dbb9ae23f695997a6199829e969918720ff3c9.tar.gz |
Issue #20540: Fix a performance regression (vs. Python 3.2) when layering a multiprocessing Connection over a TCP socket.
For small payloads, Nagle's algorithm would introduce idle delays before the entire transmission of a message.
Diffstat (limited to 'Lib/multiprocessing')
-rw-r--r-- | Lib/multiprocessing/connection.py | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/Lib/multiprocessing/connection.py b/Lib/multiprocessing/connection.py index 2a0bc2fa72..22589d0422 100644 --- a/Lib/multiprocessing/connection.py +++ b/Lib/multiprocessing/connection.py @@ -395,13 +395,23 @@ class Connection(_ConnectionBase): return buf def _send_bytes(self, buf): - # For wire compatibility with 3.2 and lower n = len(buf) - self._send(struct.pack("!i", n)) - # The condition is necessary to avoid "broken pipe" errors - # when sending a 0-length buffer if the other end closed the pipe. - if n > 0: - self._send(buf) + # For wire compatibility with 3.2 and lower + header = struct.pack("!i", n) + if n > 16384: + # The payload is large so Nagle's algorithm won't be triggered + # and we'd better avoid the cost of concatenation. + chunks = [header, buf] + elif n > 0: + # Issue # 20540: concatenate before sending, to avoid delays due + # to Nagle's algorithm on a TCP socket. + chunks = [header + buf] + else: + # This code path is necessary to avoid "broken pipe" errors + # when sending a 0-length buffer if the other end closed the pipe. + chunks = [header] + for chunk in chunks: + self._send(chunk) def _recv_bytes(self, maxsize=None): buf = self._recv(4) |