| hg-reviewers |
I want wire protocol interactions to report the number of
requests made and bytes transferred.
This commit teaches the very low-level custom HTTPConnection class
to track the number of bytes sent to the socket. This may vary from
the number of bytes that go on the wire due to e.g. TLS. That's OK.
KeepAliveHandler is taught to track the total number of requests
and total number of bytes sent across all requests.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/keepalive.py (19 lines) |
| if host: | if host: | ||||
| return list(self._hostmap.get(host, [])) | return list(self._hostmap.get(host, [])) | ||||
| else: | else: | ||||
| return dict(self._hostmap) | return dict(self._hostmap) | ||||
| class KeepAliveHandler(object): | class KeepAliveHandler(object): | ||||
| def __init__(self): | def __init__(self): | ||||
| self._cm = ConnectionManager() | self._cm = ConnectionManager() | ||||
| self.requestscount = 0 | |||||
| self.sentbytescount = 0 | |||||
| #### Connection Management | #### Connection Management | ||||
| def open_connections(self): | def open_connections(self): | ||||
| """return a list of connected hosts and the number of connections | """return a list of connected hosts and the number of connections | ||||
| to each. [('foo.com:80', 2), ('bar.org', 1)]""" | to each. [('foo.com:80', 2), ('bar.org', 1)]""" | ||||
| return [(host, len(li)) for (host, li) in self._cm.get_all().items()] | return [(host, len(li)) for (host, li) in self._cm.get_all().items()] | ||||
| def close_connection(self, host): | def close_connection(self, host): | ||||
| r = None | r = None | ||||
| else: | else: | ||||
| if DEBUG: | if DEBUG: | ||||
| DEBUG.info("re-using connection to %s (%d)", host, id(h)) | DEBUG.info("re-using connection to %s (%d)", host, id(h)) | ||||
| return r | return r | ||||
| def _start_transaction(self, h, req): | def _start_transaction(self, h, req): | ||||
| oldbytescount = h.sentbytescount | |||||
| # What follows mostly reimplements HTTPConnection.request() | # What follows mostly reimplements HTTPConnection.request() | ||||
| # except it adds self.parent.addheaders in the mix and sends headers | # except it adds self.parent.addheaders in the mix and sends headers | ||||
| # in a deterministic order (to make testing easier). | # in a deterministic order (to make testing easier). | ||||
| headers = util.sortdict(self.parent.addheaders) | headers = util.sortdict(self.parent.addheaders) | ||||
| headers.update(sorted(req.headers.items())) | headers.update(sorted(req.headers.items())) | ||||
| headers.update(sorted(req.unredirected_hdrs.items())) | headers.update(sorted(req.unredirected_hdrs.items())) | ||||
| headers = util.sortdict((n.lower(), v) for n, v in headers.items()) | headers = util.sortdict((n.lower(), v) for n, v in headers.items()) | ||||
| skipheaders = {} | skipheaders = {} | ||||
| except socket.error as err: | except socket.error as err: | ||||
| raise urlerr.urlerror(err) | raise urlerr.urlerror(err) | ||||
| for k, v in headers.items(): | for k, v in headers.items(): | ||||
| h.putheader(k, v) | h.putheader(k, v) | ||||
| h.endheaders() | h.endheaders() | ||||
| if urllibcompat.hasdata(req): | if urllibcompat.hasdata(req): | ||||
| h.send(data) | h.send(data) | ||||
| # This will fail to record events in case of I/O failure. That's OK. | |||||
| self.requestscount += 1 | |||||
| self.sentbytescount += h.sentbytescount - oldbytescount | |||||
| try: | |||||
| self.parent.requestscount += 1 | |||||
| self.parent.sentbytescount += h.sentbytescount - oldbytescount | |||||
| except AttributeError: | |||||
| pass | |||||
| class HTTPHandler(KeepAliveHandler, urlreq.httphandler): | class HTTPHandler(KeepAliveHandler, urlreq.httphandler): | ||||
| pass | pass | ||||
| class HTTPResponse(httplib.HTTPResponse): | class HTTPResponse(httplib.HTTPResponse): | ||||
| # we need to subclass HTTPResponse in order to | # we need to subclass HTTPResponse in order to | ||||
| # 1) add readline(), readlines(), and readinto() methods | # 1) add readline(), readlines(), and readinto() methods | ||||
| # 2) add close_connection() methods | # 2) add close_connection() methods | ||||
| # 3) add info() and geturl() methods | # 3) add info() and geturl() methods | ||||
| blocksize = 8192 | blocksize = 8192 | ||||
| read = getattr(str, 'read', None) | read = getattr(str, 'read', None) | ||||
| if read is not None: | if read is not None: | ||||
| if self.debuglevel > 0: | if self.debuglevel > 0: | ||||
| print("sending a read()able") | print("sending a read()able") | ||||
| data = read(blocksize) | data = read(blocksize) | ||||
| while data: | while data: | ||||
| self.sock.sendall(data) | self.sock.sendall(data) | ||||
| self.sentbytescount += len(data) | |||||
| data = read(blocksize) | data = read(blocksize) | ||||
| else: | else: | ||||
| self.sock.sendall(str) | self.sock.sendall(str) | ||||
| self.sentbytescount += len(str) | |||||
| except socket.error as v: | except socket.error as v: | ||||
| reraise = True | reraise = True | ||||
| if v[0] == errno.EPIPE: # Broken pipe | if v[0] == errno.EPIPE: # Broken pipe | ||||
| if self._HTTPConnection__state == httplib._CS_REQ_SENT: | if self._HTTPConnection__state == httplib._CS_REQ_SENT: | ||||
| self._broken_pipe_resp = None | self._broken_pipe_resp = None | ||||
| self._broken_pipe_resp = self.getresponse() | self._broken_pipe_resp = self.getresponse() | ||||
| reraise = False | reraise = False | ||||
| self.close() | self.close() | ||||
| # attributes, be sure to audit httpsconnection() for unintended | # attributes, be sure to audit httpsconnection() for unintended | ||||
| # consequences. | # consequences. | ||||
| # use the modified response class | # use the modified response class | ||||
| response_class = HTTPResponse | response_class = HTTPResponse | ||||
| send = safesend | send = safesend | ||||
| getresponse = wrapgetresponse(httplib.HTTPConnection) | getresponse = wrapgetresponse(httplib.HTTPConnection) | ||||
| def __init__(self, *args, **kwargs): | |||||
| httplib.HTTPConnection.__init__(self, *args, **kwargs) | |||||
| self.sentbytescount = 0 | |||||
| ######################################################################### | ######################################################################### | ||||
| ##### TEST FUNCTIONS | ##### TEST FUNCTIONS | ||||
| ######################################################################### | ######################################################################### | ||||
| def continuity(url): | def continuity(url): | ||||
| md5 = hashlib.md5 | md5 = hashlib.md5 | ||||