This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1737

commandserver: unblock SIGCHLD
ClosedPublic

Authored by quark on Dec 20 2017, 5:12 AM.

Details

Reviewers
yuja
Group Reviewers
hg-reviewers
Commits
rHG3a119a423953: commandserver: unblock SIGCHLD
Summary

This enables the SIGCHLD handler to work properly if some buggy program
started chg server with SIGCHLD blocked.

A test of this probably requires C code, but we don't have such kind of
tests already. Since this is a simple and clear fix, I'm leaving it as
"untested" but I did a manual test and there were no longer zombie workers.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

quark created this revision.Dec 20 2017, 5:12 AM
yuja requested changes to this revision.Dec 20 2017, 8:29 AM
yuja added a subscriber: yuja.
yuja added inline comments.
mercurial/commandserver.py
454

My two cents, add alias util.unblocksignal(), and probably better not ignoring OSError.

This revision now requires changes to proceed.Dec 20 2017, 8:29 AM
quark updated this revision to Diff 4562.Dec 20 2017, 2:38 PM
yuja accepted this revision.Dec 21 2017, 9:34 AM
This revision is now accepted and ready to land.Dec 21 2017, 9:34 AM
Closed by commit rHG3a119a423953: commandserver: unblock SIGCHLD (authored by quark). · Explain WhyDec 21 2017, 9:54 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/commandserver.py (2 lines)

Diff 4570

mercurial/commandserver.py

self._sock = None self._sock = None
self._oldsigchldhandler = None self._oldsigchldhandler = None
self._workerpids = set() # updated by signal handler; do not iterate self._workerpids = set() # updated by signal handler; do not iterate
self._socketunlinked = None self._socketunlinked = None
def init(self): def init(self):
self._sock = socket.socket(socket.AF_UNIX) self._sock = socket.socket(socket.AF_UNIX)
self._servicehandler.bindsocket(self._sock, self.address) self._servicehandler.bindsocket(self._sock, self.address)
if util.safehasattr(util, 'unblocksignal'):
util.unblocksignal(signal.SIGCHLD)
o = signal.signal(signal.SIGCHLD, self._sigchldhandler) o = signal.signal(signal.SIGCHLD, self._sigchldhandler)
yujaUnsubmitted
Not Done

My two cents, add alias util.unblocksignal(), and probably better not ignoring OSError.

yuja: My two cents, add alias `util.unblocksignal()`, and probably better not ignoring OSError.
self._oldsigchldhandler = o self._oldsigchldhandler = o
self._socketunlinked = False self._socketunlinked = False
def _unlinksocket(self): def _unlinksocket(self):
if not self._socketunlinked: if not self._socketunlinked:
self._servicehandler.unlinksocket(self.address) self._servicehandler.unlinksocket(self.address)
self._socketunlinked = True self._socketunlinked = True