Mercurial > hg
view setup_osutil_cffi.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 | a043c6d372db |
children |
line wrap: on
line source
from __future__ import absolute_import import cffi ffi = cffi.FFI() ffi.set_source("_osutil_cffi", """ #include <sys/attr.h> #include <sys/vnode.h> #include <unistd.h> #include <fcntl.h> #include <time.h> typedef struct val_attrs { uint32_t length; attribute_set_t returned; attrreference_t name_info; fsobj_type_t obj_type; struct timespec mtime; uint32_t accessmask; off_t datalength; } __attribute__((aligned(4), packed)) val_attrs_t; """, include_dirs=['mercurial']) ffi.cdef(''' typedef uint32_t attrgroup_t; typedef struct attrlist { uint16_t bitmapcount; /* number of attr. bit sets in list */ uint16_t reserved; /* (to maintain 4-byte alignment) */ attrgroup_t commonattr; /* common attribute group */ attrgroup_t volattr; /* volume attribute group */ attrgroup_t dirattr; /* directory attribute group */ attrgroup_t fileattr; /* file attribute group */ attrgroup_t forkattr; /* fork attribute group */ ...; }; typedef struct attribute_set { ...; } attribute_set_t; typedef struct attrreference { int attr_dataoffset; int attr_length; ...; } attrreference_t; typedef int ... off_t; typedef struct val_attrs { uint32_t length; attribute_set_t returned; attrreference_t name_info; uint32_t obj_type; struct timespec mtime; uint32_t accessmask; off_t datalength; ...; } val_attrs_t; /* the exact layout of the above struct will be figured out during build time */ typedef int ... time_t; typedef struct timespec { time_t tv_sec; ...; }; int getattrlist(const char* path, struct attrlist * attrList, void * attrBuf, size_t attrBufSize, unsigned int options); int getattrlistbulk(int dirfd, struct attrlist * attrList, void * attrBuf, size_t attrBufSize, uint64_t options); #define ATTR_BIT_MAP_COUNT ... #define ATTR_CMN_NAME ... #define ATTR_CMN_OBJTYPE ... #define ATTR_CMN_MODTIME ... #define ATTR_CMN_ACCESSMASK ... #define ATTR_CMN_ERROR ... #define ATTR_CMN_RETURNED_ATTRS ... #define ATTR_FILE_DATALENGTH ... #define VREG ... #define VDIR ... #define VLNK ... #define VBLK ... #define VCHR ... #define VFIFO ... #define VSOCK ... #define S_IFMT ... int open(const char *path, int oflag, int perm); int close(int); #define O_RDONLY ... ''') if __name__ == '__main__': ffi.compile()