mirrors/cpython
0
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2024-11-28 04:15:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

bpo-30185: avoid KeyboardInterrupt tracebacks in forkserver (#1319)

Browse Source 
* bpo-30185: avoid KeyboardInterrupt tracebacks in forkserver

* Tweak comment
This commit is contained in:
Antoine Pitrou 2017-05-04 16:44:53 +02:00 committed by GitHub
parent 3d0056842c
commit 6dd4d734ed
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Lib/multiprocessing/forkserver.py
View File

@ -149,8 +149,15 @@ def main(listener_fd, alive_r, preload, main_path=None, sys_path=None):
util._close_stdin()
# ignoring SIGCHLD means no need to reap zombie processes
handler = signal.signal(signal.SIGCHLD, signal.SIG_IGN)
# ignoring SIGCHLD means no need to reap zombie processes;
# letting SIGINT through avoids KeyboardInterrupt tracebacks
handlers = {
signal.SIGCHLD: signal.SIG_IGN,
signal.SIGINT: signal.SIG_DFL,
}
old_handlers = {sig: signal.signal(sig, val)
for (sig, val) in handlers.items()}
with socket.socket(socket.AF_UNIX, fileno=listener_fd) as listener, \
selectors.DefaultSelector() as selector:
_forkserver._forkserver_address = listener.getsockname()
@ -175,7 +182,7 @@ def main(listener_fd, alive_r, preload, main_path=None, sys_path=None):
code = 1
if os.fork() == 0:
try:
_serve_one(s, listener, alive_r, handler)
_serve_one(s, listener, alive_r, old_handlers)
except Exception:
sys.excepthook(*sys.exc_info())
sys.stderr.flush()
@ -186,11 +193,12 @@ def main(listener_fd, alive_r, preload, main_path=None, sys_path=None):
if e.errno != errno.ECONNABORTED:
raise
def _serve_one(s, listener, alive_r, handler):
# close unnecessary stuff and reset SIGCHLD handler
def _serve_one(s, listener, alive_r, handlers):
# close unnecessary stuff and reset signal handlers
listener.close()
os.close(alive_r)
signal.signal(signal.SIGCHLD, handler)
for sig, val in handlers.items():
signal.signal(sig, val)
# receive fds from parent process
fds = reduction.recvfds(s, MAXFDS_TO_SEND + 1)

3
Misc/NEWS
View File

@ -317,6 +317,9 @@ Extension Modules
Library
-------
- bpo-30185: Avoid KeyboardInterrupt tracebacks in forkserver helper process
when Ctrl-C is received.
- bpo-30103: binascii.b2a_uu() and uu.encode() now support using ``'`'``
as zero instead of space.