This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8141

darwin: add another preemptive gui() call when using chg
ClosedPublic

Authored by spectral on Feb 20 2020, 9:05 PM.

Details

Reviewers
marmoute
Group Reviewers
hg-reviewers
Commits
rHG6392bd7c26a8: darwin: add another preemptive gui() call when using chg
Summary

Changeset a89381e04c58 added this gui() call before background forks, and
Google's extensions do background forks on essentially every invocation for
logging purposes. The crash is reliably (though not 100%) reproducible without
this change when running HGPLAIN=1 chg status in one of our repos. With this
fix, I haven't been able to trigger the crash anymore.

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

spectral created this revision.Feb 20 2020, 9:05 PM
marmoute accepted this revision.Feb 21 2020, 3:49 AM
marmoute added a subscriber: marmoute.

I would be nice to have test but I assume this is hard. The description seems clear so I trusting Kyle on this one.

spectral added a commit: rHG6392bd7c26a8: darwin: add another preemptive gui() call when using chg.Feb 21 2020, 4:55 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG6392bd7c26a8: darwin: add another preemptive gui() call when using chg (authored by spectral). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/commandserver.py (4 lines)

Diff 20268

mercurial/commandserver.py

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
# experimental config: cmdserver.max-repo-cache # experimental config: cmdserver.max-repo-cache
maxlen = ui.configint(b'cmdserver', b'max-repo-cache') maxlen = ui.configint(b'cmdserver', b'max-repo-cache')
if maxlen < 0: if maxlen < 0:
raise error.Abort(_(b'negative max-repo-cache size not allowed')) raise error.Abort(_(b'negative max-repo-cache size not allowed'))
self._repoloader = repocache.repoloader(ui, maxlen) self._repoloader = repocache.repoloader(ui, maxlen)
# attempt to avoid crash in CoreFoundation when using chg after fix in
# a89381e04c58
if pycompat.isdarwin:
procutil.gui()
def init(self): def init(self):
self._sock = socket.socket(socket.AF_UNIX) self._sock = socket.socket(socket.AF_UNIX)
# IPC channel from many workers to one main process; this is actually # IPC channel from many workers to one main process; this is actually
# a uni-directional pipe, but is backed by a DGRAM socket so each # a uni-directional pipe, but is backed by a DGRAM socket so each
# message can be easily separated. # message can be easily separated.
o = socket.socketpair(socket.AF_UNIX, socket.SOCK_DGRAM) o = socket.socketpair(socket.AF_UNIX, socket.SOCK_DGRAM)
self._mainipc, self._workeripc = o self._mainipc, self._workeripc = o