comparison mercurial/hgweb/protocol.py @ 30206:d105195436c0

wireproto: compress data from a generator Currently, the "getbundle" wire protocol command obtains a generator of data, converts it to a util.chunkbuffer, then converts it back to a generator via the protocol's groupchunks() implementation. For the SSH protocol, groupchunks() simply reads 4kb chunks then write()s the data to a file descriptor. For the HTTP protocol, groupchunks() reads 32kb chunks, feeds those into a zlib compressor, emits compressed data as it is available, and that is sent to the WSGI layer, where it is likely turned into HTTP chunked transfer chunks as is or further buffered and turned into a larger chunk. For both the SSH and HTTP protocols, there is inefficiency from using util.chunkbuffer. For SSH, emitting consistent 4kb chunks sounds nice. However, the file descriptor it is writing to is almost certainly buffered. That means that a Python .write() probably doesn't translate into exactly what is written to the I/O layer. For HTTP, we're going through an intermediate layer to zlib compress data. So all util.chunkbuffer is doing is ensuring that the chunks we feed into the zlib compressor are of uniform size. This means more CPU time in Python buffering and emitting chunks in util.chunkbuffer but fewer function calls to zlib. This patch introduces and implements a new wire protocol abstract method: compresschunks(). It is like groupchunks() except it operates on a generator instead of something with a .read(). The SSH implementation simply proxies chunks. The HTTP implementation uses zlib compression. To avoid duplicate code, the HTTP groupchunks() has been reimplemented in terms of compresschunks(). To prove this all works, the "getbundle" wire protocol command has been switched to compresschunks(). This removes the util.chunkbuffer from that command. Now, data essentially streams straight from the changegroup emitter to the wire, possibly through a zlib compressor. Generators all the way, baby. There were slim to no performance changes on the server as measured with the mozilla-central repository. This is likely because CPU time is dominated by reading revlogs, producing the changegroup, and zlib compressing the output stream. Still, this brings us a little closer to our ideal of using generators everywhere.
author Gregory Szorc <gregory.szorc@gmail.com>
date Sun, 16 Oct 2016 11:10:21 -0700
parents d34cf260d15b
children 38130a0bbb99
comparison
equal deleted inserted replaced
30205:b4074417b661 30206:d105195436c0
71 self.ui.ferr = self.ui.fout = stringio() 71 self.ui.ferr = self.ui.fout = stringio()
72 def restore(self): 72 def restore(self):
73 val = self.ui.fout.getvalue() 73 val = self.ui.fout.getvalue()
74 self.ui.ferr, self.ui.fout = self.oldio 74 self.ui.ferr, self.ui.fout = self.oldio
75 return val 75 return val
76
76 def groupchunks(self, fh): 77 def groupchunks(self, fh):
78 def getchunks():
79 while True:
80 chunk = fh.read(32768)
81 if not chunk:
82 break
83 yield chunk
84
85 return self.compresschunks(getchunks())
86
87 def compresschunks(self, chunks):
77 # Don't allow untrusted settings because disabling compression or 88 # Don't allow untrusted settings because disabling compression or
78 # setting a very high compression level could lead to flooding 89 # setting a very high compression level could lead to flooding
79 # the server's network or CPU. 90 # the server's network or CPU.
80 z = zlib.compressobj(self.ui.configint('server', 'zliblevel', -1)) 91 z = zlib.compressobj(self.ui.configint('server', 'zliblevel', -1))
81 while True: 92 for chunk in chunks:
82 chunk = fh.read(32768)
83 if not chunk:
84 break
85 data = z.compress(chunk) 93 data = z.compress(chunk)
86 # Not all calls to compress() emit data. It is cheaper to inspect 94 # Not all calls to compress() emit data. It is cheaper to inspect
87 # that here than to send it via the generator. 95 # that here than to send it via the generator.
88 if data: 96 if data:
89 yield data 97 yield data
90 yield z.flush() 98 yield z.flush()
99
91 def _client(self): 100 def _client(self):
92 return 'remote:%s:%s:%s' % ( 101 return 'remote:%s:%s:%s' % (
93 self.req.env.get('wsgi.url_scheme') or 'http', 102 self.req.env.get('wsgi.url_scheme') or 'http',
94 urlreq.quote(self.req.env.get('REMOTE_HOST', '')), 103 urlreq.quote(self.req.env.get('REMOTE_HOST', '')),
95 urlreq.quote(self.req.env.get('REMOTE_USER', ''))) 104 urlreq.quote(self.req.env.get('REMOTE_USER', '')))