Mercurial > hg
comparison mercurial/wireprotov1peer.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 | 1cb54e6193a6 |
children | aa9dd805234d |
comparison
equal
deleted
inserted
replaced
37809:80695628adcb | 37810:856f381ad74b |
---|---|
12 import weakref | 12 import weakref |
13 | 13 |
14 from .i18n import _ | 14 from .i18n import _ |
15 from .node import ( | 15 from .node import ( |
16 bin, | 16 bin, |
17 ) | |
18 from .thirdparty.zope import ( | |
19 interface as zi, | |
20 ) | 17 ) |
21 from . import ( | 18 from . import ( |
22 bundle2, | 19 bundle2, |
23 changegroup as changegroupmod, | 20 changegroup as changegroupmod, |
24 encoding, | 21 encoding, |
26 pushkey as pushkeymod, | 23 pushkey as pushkeymod, |
27 pycompat, | 24 pycompat, |
28 repository, | 25 repository, |
29 util, | 26 util, |
30 wireprototypes, | 27 wireprototypes, |
28 ) | |
29 from .utils import ( | |
30 interfaceutil, | |
31 ) | 31 ) |
32 | 32 |
33 urlreq = util.urlreq | 33 urlreq = util.urlreq |
34 | 34 |
35 def batchable(f): | 35 def batchable(f): |
108 # This looks like it will infinitely recurse. However, | 108 # This looks like it will infinitely recurse. However, |
109 # sendcommands() should modify __class__. This call serves as a check | 109 # sendcommands() should modify __class__. This call serves as a check |
110 # on that. | 110 # on that. |
111 return self.result(timeout) | 111 return self.result(timeout) |
112 | 112 |
113 @zi.implementer(repository.ipeercommandexecutor) | 113 @interfaceutil.implementer(repository.ipeercommandexecutor) |
114 class peerexecutor(object): | 114 class peerexecutor(object): |
115 def __init__(self, peer): | 115 def __init__(self, peer): |
116 self._peer = peer | 116 self._peer = peer |
117 self._sent = False | 117 self._sent = False |
118 self._closed = False | 118 self._closed = False |
306 except Exception: | 306 except Exception: |
307 pycompat.future_set_exception_info(f, sys.exc_info()[1:]) | 307 pycompat.future_set_exception_info(f, sys.exc_info()[1:]) |
308 else: | 308 else: |
309 f.set_result(result) | 309 f.set_result(result) |
310 | 310 |
311 @zi.implementer(repository.ipeercommands, repository.ipeerlegacycommands) | 311 @interfaceutil.implementer(repository.ipeercommands, |
312 repository.ipeerlegacycommands) | |
312 class wirepeer(repository.peer): | 313 class wirepeer(repository.peer): |
313 """Client-side interface for communicating with a peer repository. | 314 """Client-side interface for communicating with a peer repository. |
314 | 315 |
315 Methods commonly call wire protocol commands of the same name. | 316 Methods commonly call wire protocol commands of the same name. |
316 | 317 |