##// END OF EJS Templates
branchmap: use revbranchcache when updating branch map...
branchmap: use revbranchcache when updating branch map The revbranchcache is read on demand before it will be used for updating the branch map. It is written back when the branchmap is written and it will thus use the same locking as branchmap. The revbranchcache instance is short-lived; it is only stored in the branchmap from .update() is invoked and until .write() is invoked. Branchmap already assume that the repo is locked in that case. The use of revbranchcache for branch map updates will make sure that the revbranchcache "always" is kept up-to-date. The perfbranchmap benchmark is somewhat bogus, especially when we can see that the caching makes a significant difference between the realistic case of a first run and the rare case of rerunning it with a full cache. Here are some 'base' numbers on mozilla-central: Before: ! wall 6.912745 comb 6.910000 user 6.840000 sys 0.070000 (best of 3) After - initial, cache is empty: ! wall 7.792569 comb 7.790000 user 7.720000 sys 0.070000 (best of 3) After - cache is full: ! wall 0.879688 comb 0.880000 user 0.870000 sys 0.010000 (best of 4) The overhead when running with empty cache comes from checking, missing and updating it every time. Most of the performance improvement comes from not having to extract the branch info from the changelog. The last doubling of performance comes from no longer having to convert all branch names to local encoding but reuse the few already converted branch names. On the hg repo: Before: ! wall 0.715703 comb 0.710000 user 0.710000 sys 0.000000 (best of 14) After: ! wall 0.105489 comb 0.110000 user 0.110000 sys 0.000000 (best of 87)

File last commit:

r19748:59df9e52 stable
r23786:7d63398f default
Show More
socketutil.py
138 lines | 5.1 KiB | text/x-python | PythonLexer
Augie Fackler
Import new http library as mercurial.httpclient....
r14243 # Copyright 2010, Google Inc.
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are
# met:
#
# * Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# * Redistributions in binary form must reproduce the above
# copyright notice, this list of conditions and the following disclaimer
# in the documentation and/or other materials provided with the
# distribution.
# * Neither the name of Google Inc. nor the names of its
# contributors may be used to endorse or promote products derived from
# this software without specific prior written permission.
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
"""Abstraction to simplify socket use for Python < 2.6
This will attempt to use the ssl module and the new
socket.create_connection method, but fall back to the old
methods if those are unavailable.
"""
import logging
import socket
logger = logging.getLogger(__name__)
try:
import ssl
Augie Fackler
httpclient: upgrade to fe8c09e4db64 of httpplus
r19182 # make demandimporters load the module
ssl.wrap_socket # pylint: disable=W0104
Augie Fackler
Import new http library as mercurial.httpclient....
r14243 have_ssl = True
except ImportError:
import httplib
import urllib2
have_ssl = getattr(urllib2, 'HTTPSHandler', False)
ssl = False
try:
create_connection = socket.create_connection
except AttributeError:
def create_connection(address):
Augie Fackler
httpclient: upgrade to fe8c09e4db64 of httpplus
r19182 """Backport of socket.create_connection from Python 2.6."""
Augie Fackler
Import new http library as mercurial.httpclient....
r14243 host, port = address
msg = "getaddrinfo returns an empty list"
sock = None
for res in socket.getaddrinfo(host, port, 0,
socket.SOCK_STREAM):
Augie Fackler
httpclient: upgrade to fe8c09e4db64 of httpplus
r19182 af, socktype, proto, unused_canonname, sa = res
Augie Fackler
Import new http library as mercurial.httpclient....
r14243 try:
sock = socket.socket(af, socktype, proto)
logger.info("connect: (%s, %s)", host, port)
sock.connect(sa)
except socket.error, msg:
logger.info('connect fail: %s %s', host, port)
if sock:
sock.close()
sock = None
continue
break
if not sock:
Augie Fackler
httpclient: apply change df9aea1def3e: remove use of two-argument raise
r18179 raise socket.error(msg)
Augie Fackler
Import new http library as mercurial.httpclient....
r14243 return sock
if ssl:
wrap_socket = ssl.wrap_socket
CERT_NONE = ssl.CERT_NONE
CERT_OPTIONAL = ssl.CERT_OPTIONAL
CERT_REQUIRED = ssl.CERT_REQUIRED
else:
class FakeSocket(httplib.FakeSocket):
Augie Fackler
httpclient: upgrade to fe8c09e4db64 of httpplus
r19182 """Socket wrapper that supports SSL."""
# Silence lint about this goofy backport class
# pylint: disable=W0232,E1101,R0903,R0913,C0111
Augie Fackler
Import new http library as mercurial.httpclient....
r14243 # backport the behavior from Python 2.6, which is to busy wait
# on the socket instead of anything nice. Sigh.
# See http://bugs.python.org/issue3890 for more info.
def recv(self, buflen=1024, flags=0):
"""ssl-aware wrapper around socket.recv
"""
if flags != 0:
raise ValueError(
"non-zero flags not allowed in calls to recv() on %s" %
self.__class__)
while True:
try:
return self._ssl.read(buflen)
except socket.sslerror, x:
if x.args[0] == socket.SSL_ERROR_WANT_READ:
continue
else:
raise x
Augie Fackler
httpclient: apply upstream revision da7579b034a4 to fix SSL problems (issue4038)
r19748 _PROTOCOL_SSLv23 = 2
Augie Fackler
Import new http library as mercurial.httpclient....
r14243
CERT_NONE = 0
CERT_OPTIONAL = 1
CERT_REQUIRED = 2
Augie Fackler
httpclient: upgrade to fe8c09e4db64 of httpplus
r19182 # Disable unused-argument because we're making a dumb wrapper
# that's like an upstream method.
#
# pylint: disable=W0613,R0913
Augie Fackler
Import new http library as mercurial.httpclient....
r14243 def wrap_socket(sock, keyfile=None, certfile=None,
server_side=False, cert_reqs=CERT_NONE,
Augie Fackler
httpclient: apply upstream revision da7579b034a4 to fix SSL problems (issue4038)
r19748 ssl_version=_PROTOCOL_SSLv23, ca_certs=None,
Augie Fackler
Import new http library as mercurial.httpclient....
r14243 do_handshake_on_connect=True,
suppress_ragged_eofs=True):
Augie Fackler
httpclient: upgrade to fe8c09e4db64 of httpplus
r19182 """Backport of ssl.wrap_socket from Python 2.6."""
Augie Fackler
Import new http library as mercurial.httpclient....
r14243 if cert_reqs != CERT_NONE and ca_certs:
raise CertificateValidationUnsupported(
'SSL certificate validation requires the ssl module'
'(included in Python 2.6 and later.)')
sslob = socket.ssl(sock)
# borrow httplib's workaround for no ssl.wrap_socket
sock = FakeSocket(sock, sslob)
return sock
Augie Fackler
httpclient: upgrade to fe8c09e4db64 of httpplus
r19182 # pylint: enable=W0613,R0913
Augie Fackler
Import new http library as mercurial.httpclient....
r14243
class CertificateValidationUnsupported(Exception):
"""Exception raised when cert validation is requested but unavailable."""
# no-check-code