mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-14 22:01:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

Issue #2489: Fix bug in _copy loop that could consume 100% cpu on EOF.

Browse source
This commit is contained in:
Gregory P. Smith 2012-02-16 00:40:03 -08:00
parent c0b1172459
commit b4b605624d
2 changed files with 101 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Lib/pty.py
View file

@ -142,15 +142,21 @@ def _copy(master_fd, master_read=_read, stdin_read=_read):
Copies
pty master -> standard output (master_read)
standard input -> pty master (stdin_read)"""
while 1:
rfds, wfds, xfds = select(
[master_fd, STDIN_FILENO], [], [])
fds = [master_fd, STDIN_FILENO]
while True:
rfds, wfds, xfds = select(fds, [], [])
if master_fd in rfds:
data = master_read(master_fd)
os.write(STDOUT_FILENO, data)
if not data: # Reached EOF.
fds.remove(master_fd)
else:
os.write(STDOUT_FILENO, data)
if STDIN_FILENO in rfds:
data = stdin_read(STDIN_FILENO)
_writen(master_fd, data)
if not data:
fds.remove(STDIN_FILENO)
else:
_writen(master_fd, data)
def spawn(argv, master_read=_read, stdin_read=_read):
"""Create a spawned process."""