facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-09 08:18:15 +03:00
Code Issues Projects Releases Wiki Activity

worker: add a SIGCHLD handler to collect worker immediately

Browse Source 
As planned by previous patches, add a SIGCHLD handler to get notifications
about worker exits, and deals with worker failure immediately.

Note that the SIGCHLD handler gets unregistered before killworkers(), so
SIGCHLD won't interrupt "killworkers" - making it harder to send kill
signals to waited processes.
This commit is contained in:
Jun Wu 2016-11-12 03:07:22 +00:00
parent 5b9ad89016
commit 483697646a
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mercurial/worker.py
View File

@ -115,11 +115,17 @@ def _posixworker(ui, func, staticargs, args):
st = _exitstatus(st)
if st and not problem[0]:
problem[0] = st
# unregister SIGCHLD handler as all children will be killed
signal.signal(signal.SIGCHLD, oldchldhandler)
killworkers()
def sigchldhandler(signum, frame):
waitforworkers(blocking=False)
oldchldhandler = signal.signal(signal.SIGCHLD, sigchldhandler)
for pargs in partition(args, workers):
pid = os.fork()
if pid == 0:
signal.signal(signal.SIGINT, oldhandler)
signal.signal(signal.SIGCHLD, oldchldhandler)
try:
os.close(rfd)
for i, item in func(*(staticargs + (pargs,))):
@ -137,6 +143,7 @@ def _posixworker(ui, func, staticargs, args):
def cleanup():
signal.signal(signal.SIGINT, oldhandler)
t.join()
signal.signal(signal.SIGCHLD, oldchldhandler)
status = problem[0]
if status:
if status < 0: