Mercurial > hg
comparison mercurial/wireprotoserver.py @ 37810:856f381ad74b stable
interfaceutil: module to stub out zope.interface
The startup time of `hg` increased during the 4.6 development cycle. A
cause of that was importing more modules and doing more work at module
import time.
The import of zope.interface and the declaring of various interfaces
is partially responsible for the startup time regression.
Our current usage of zope.interface doesn't do much at run time: we are
merely declaring interfaces and stating that certain types implement
various interfaces. Core Mercurial is not (yet) using of any of
zope.interface features that actually require that interface plumbing be
defined. The only place we actually need the interface metadata is in
test-check-interfaces.py.
This commit establishes a new interfaceutil module. It exposes the subset
of the zope.interface API that we currently use. By default, the APIs
no-op. But if an environment variable is set, we export the real
zope.interface APIs.
Existing importers of zope.interface have been converted to use the new
module. test-check-interfaces.py has been updated to define the
environment variable so the real zope.interface is used.
The net effect of this change is we stop importing 9 zope.interface.*
modules and we no longer perform interface bookkeeping when registering
interfaces.
On my i7-6700K on Linux, a shell loop that runs `hg log -r .` 300 times
on a repo with 1 commit shows a significant CPU time improvement
(average of 4 runs):
4.5: 14.814s
before: 19.028s
after: 16.945s
And with `run-tests.py -j10` (single run):
4.5: ~3100s (~51.7m)
before: ~4450s (~74.2m)
after: ~3980s (~66.3m)
So this claws back about half of the regressions in 4.6.
Differential Revision: https://phab.mercurial-scm.org/D3419
author | Gregory Szorc <gregory.szorc@gmail.com> |
---|---|
date | Sun, 22 Apr 2018 11:54:10 -0700 |
parents | b4d85bc122bd |
children | dc1ed7fe33e4 |
comparison
equal
deleted
inserted
replaced
37809:80695628adcb | 37810:856f381ad74b |
---|---|
12 import threading | 12 import threading |
13 | 13 |
14 from .i18n import _ | 14 from .i18n import _ |
15 from .thirdparty import ( | 15 from .thirdparty import ( |
16 cbor, | 16 cbor, |
17 ) | |
18 from .thirdparty.zope import ( | |
19 interface as zi, | |
20 ) | 17 ) |
21 from . import ( | 18 from . import ( |
22 encoding, | 19 encoding, |
23 error, | 20 error, |
24 hook, | 21 hook, |
27 wireprototypes, | 24 wireprototypes, |
28 wireprotov1server, | 25 wireprotov1server, |
29 wireprotov2server, | 26 wireprotov2server, |
30 ) | 27 ) |
31 from .utils import ( | 28 from .utils import ( |
29 interfaceutil, | |
32 procutil, | 30 procutil, |
33 ) | 31 ) |
34 | 32 |
35 stringio = util.stringio | 33 stringio = util.stringio |
36 | 34 |
60 chunks.append(pycompat.bytesurl(v)) | 58 chunks.append(pycompat.bytesurl(v)) |
61 i += 1 | 59 i += 1 |
62 | 60 |
63 return ''.join(chunks) | 61 return ''.join(chunks) |
64 | 62 |
65 @zi.implementer(wireprototypes.baseprotocolhandler) | 63 @interfaceutil.implementer(wireprototypes.baseprotocolhandler) |
66 class httpv1protocolhandler(object): | 64 class httpv1protocolhandler(object): |
67 def __init__(self, req, ui, checkperm): | 65 def __init__(self, req, ui, checkperm): |
68 self._req = req | 66 self._req = req |
69 self._ui = ui | 67 self._ui = ui |
70 self._checkperm = checkperm | 68 self._checkperm = checkperm |
487 ferr.write(b'%s\n-\n' % rsp) | 485 ferr.write(b'%s\n-\n' % rsp) |
488 ferr.flush() | 486 ferr.flush() |
489 fout.write(b'\n') | 487 fout.write(b'\n') |
490 fout.flush() | 488 fout.flush() |
491 | 489 |
492 @zi.implementer(wireprototypes.baseprotocolhandler) | 490 @interfaceutil.implementer(wireprototypes.baseprotocolhandler) |
493 class sshv1protocolhandler(object): | 491 class sshv1protocolhandler(object): |
494 """Handler for requests services via version 1 of SSH protocol.""" | 492 """Handler for requests services via version 1 of SSH protocol.""" |
495 def __init__(self, ui, fin, fout): | 493 def __init__(self, ui, fin, fout): |
496 self._ui = ui | 494 self._ui = ui |
497 self._fin = fin | 495 self._fin = fin |