Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Issue #19310: asyncio: fix child processes reaping logic.

This commit is contained in:
Charles-François Natali 2013-10-20 23:23:44 +02:00
parent e5a3154c63
commit 5121debebf
1 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
Lib/asyncio/unix_events.py
View File

@ -167,23 +167,25 @@ class SelectorEventLoop(selector_events.BaseSelectorEventLoop):
def _sig_chld(self):
try:
try:
pid, status = os.waitpid(-1, os.WNOHANG)
except ChildProcessError:
return
if pid == 0:
self.call_soon(self._sig_chld)
return
elif os.WIFSIGNALED(status):
returncode = -os.WTERMSIG(status)
elif os.WIFEXITED(status):
returncode = os.WEXITSTATUS(status)
else:
self.call_soon(self._sig_chld)
return
transp = self._subprocesses.get(pid)
if transp is not None:
transp._process_exited(returncode)
# because of signal coalescing, we must keep calling waitpid() as
# long as we're able to reap a child
while True:
try:
pid, status = os.waitpid(-1, os.WNOHANG)
except ChildProcessError:
break
if pid == 0:
break
elif os.WIFSIGNALED(status):
returncode = -os.WTERMSIG(status)
elif os.WIFEXITED(status):
returncode = os.WEXITSTATUS(status)
else:
# shouldn't happen
continue
transp = self._subprocesses.get(pid)
if transp is not None:
transp._process_exited(returncode)
except Exception:
logger.exception('Unknown exception in SIGCHLD handler')