Mercurial > public > mercurial-scm > hg
comparison mercurial/wireprototypes.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 | 9d818539abfa |
| children | 07b58266bce3 |
comparison
equal
deleted
inserted
replaced
| 37809:80695628adcb | 37810:856f381ad74b |
|---|---|
| 6 from __future__ import absolute_import | 6 from __future__ import absolute_import |
| 7 | 7 |
| 8 from .node import ( | 8 from .node import ( |
| 9 bin, | 9 bin, |
| 10 hex, | 10 hex, |
| 11 ) | |
| 12 from .thirdparty.zope import ( | |
| 13 interface as zi, | |
| 14 ) | 11 ) |
| 15 from .i18n import _ | 12 from .i18n import _ |
| 16 from . import ( | 13 from . import ( |
| 17 error, | 14 error, |
| 18 util, | 15 util, |
| 16 ) | |
| 17 from .utils import ( | |
| 18 interfaceutil, | |
| 19 ) | 19 ) |
| 20 | 20 |
| 21 # Names of the SSH protocol implementations. | 21 # Names of the SSH protocol implementations. |
| 22 SSHV1 = 'ssh-v1' | 22 SSHV1 = 'ssh-v1' |
| 23 # These are advertised over the wire. Increment the counters at the end | 23 # These are advertised over the wire. Increment the counters at the end |
| 177 'cg': 'boolean', | 177 'cg': 'boolean', |
| 178 'cbattempted': 'boolean', | 178 'cbattempted': 'boolean', |
| 179 'stream': 'boolean', | 179 'stream': 'boolean', |
| 180 } | 180 } |
| 181 | 181 |
| 182 class baseprotocolhandler(zi.Interface): | 182 class baseprotocolhandler(interfaceutil.Interface): |
| 183 """Abstract base class for wire protocol handlers. | 183 """Abstract base class for wire protocol handlers. |
| 184 | 184 |
| 185 A wire protocol handler serves as an interface between protocol command | 185 A wire protocol handler serves as an interface between protocol command |
| 186 handlers and the wire protocol transport layer. Protocol handlers provide | 186 handlers and the wire protocol transport layer. Protocol handlers provide |
| 187 methods to read command arguments, redirect stdio for the duration of | 187 methods to read command arguments, redirect stdio for the duration of |
| 188 the request, handle response types, etc. | 188 the request, handle response types, etc. |
| 189 """ | 189 """ |
| 190 | 190 |
| 191 name = zi.Attribute( | 191 name = interfaceutil.Attribute( |
| 192 """The name of the protocol implementation. | 192 """The name of the protocol implementation. |
| 193 | 193 |
| 194 Used for uniquely identifying the transport type. | 194 Used for uniquely identifying the transport type. |
| 195 """) | 195 """) |
| 196 | 196 |