gh-103607: Fix pause_reading to work when called from connection_made in asyncio. (#17425)

Co-authored-by: Kumar Aditya <59607654+kumaraditya303@users.noreply.github.com>
This commit is contained in:
Itayazolay 2023-04-27 13:03:29 +03:00 committed by GitHub
parent dff8e5dc8d
commit 78942ecd9b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 62 additions and 24 deletions

View file

@ -794,6 +794,8 @@ class _SelectorTransport(transports._FlowControlMixin,
self._buffer = collections.deque()
self._conn_lost = 0 # Set when call to connection_lost scheduled.
self._closing = False # Set when close() called.
self._paused = False # Set when pause_reading() called
if self._server is not None:
self._server._attach()
loop._transports[self._sock_fd] = self
@ -839,6 +841,25 @@ class _SelectorTransport(transports._FlowControlMixin,
def is_closing(self):
return self._closing
def is_reading(self):
return not self.is_closing() and not self._paused
def pause_reading(self):
if not self.is_reading():
return
self._paused = True
self._loop._remove_reader(self._sock_fd)
if self._loop.get_debug():
logger.debug("%r pauses reading", self)
def resume_reading(self):
if self._closing or not self._paused:
return
self._paused = False
self._add_reader(self._sock_fd, self._read_ready)
if self._loop.get_debug():
logger.debug("%r resumes reading", self)
def close(self):
if self._closing:
return
@ -898,9 +919,8 @@ class _SelectorTransport(transports._FlowControlMixin,
return sum(map(len, self._buffer))
def _add_reader(self, fd, callback, *args):
if self._closing:
if not self.is_reading():
return
self._loop._add_reader(fd, callback, *args)
@ -915,7 +935,6 @@ class _SelectorSocketTransport(_SelectorTransport):
self._read_ready_cb = None
super().__init__(loop, sock, protocol, extra, server)
self._eof = False
self._paused = False
self._empty_waiter = None
if _HAS_SENDMSG:
self._write_ready = self._write_sendmsg
@ -943,25 +962,6 @@ class _SelectorSocketTransport(_SelectorTransport):
super().set_protocol(protocol)
def is_reading(self):
return not self._paused and not self._closing
def pause_reading(self):
if self._closing or self._paused:
return
self._paused = True
self._loop._remove_reader(self._sock_fd)
if self._loop.get_debug():
logger.debug("%r pauses reading", self)
def resume_reading(self):
if self._closing or not self._paused:
return
self._paused = False
self._add_reader(self._sock_fd, self._read_ready)
if self._loop.get_debug():
logger.debug("%r resumes reading", self)
def _read_ready(self):
self._read_ready_cb()