summaryrefslogtreecommitdiffstats
path: root/Lib/asyncio
diff options
context:
space:
mode:
authorAndrew Svetlov <andrew.svetlov@gmail.com>2019-09-29 12:00:35 (GMT)
committerGitHub <noreply@github.com>2019-09-29 12:00:35 (GMT)
commit58498bc7178608b1ab031994ca09c43889ce3e76 (patch)
tree2b945023e53be4820c36bde1f95e4fb2c8523d43 /Lib/asyncio
parent9a7d9519506ae807ca48ff02e2ea117ebac3450e (diff)
downloadcpython-58498bc7178608b1ab031994ca09c43889ce3e76.zip
cpython-58498bc7178608b1ab031994ca09c43889ce3e76.tar.gz
cpython-58498bc7178608b1ab031994ca09c43889ce3e76.tar.bz2
bpo-38019: correctly handle pause/resume reading of closed asyncio unix pipe (GH-16472)
Diffstat (limited to 'Lib/asyncio')
-rw-r--r--Lib/asyncio/unix_events.py11
1 files changed, 11 insertions, 0 deletions
diff --git a/Lib/asyncio/unix_events.py b/Lib/asyncio/unix_events.py
index cbbb106..d8f6530 100644
--- a/Lib/asyncio/unix_events.py
+++ b/Lib/asyncio/unix_events.py
@@ -445,6 +445,7 @@ class _UnixReadPipeTransport(transports.ReadTransport):
self._fileno = pipe.fileno()
self._protocol = protocol
self._closing = False
+ self._paused = False
mode = os.fstat(self._fileno).st_mode
if not (stat.S_ISFIFO(mode) or
@@ -506,10 +507,20 @@ class _UnixReadPipeTransport(transports.ReadTransport):
self._loop.call_soon(self._call_connection_lost, None)
def pause_reading(self):
+ if self._closing or self._paused:
+ return
+ self._paused = True
self._loop._remove_reader(self._fileno)
+ 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._loop._add_reader(self._fileno, self._read_ready)
+ if self._loop.get_debug():
+ logger.debug("%r resumes reading", self)
def set_protocol(self, protocol):
self._protocol = protocol