Mercurial > hg
view contrib/python-zstandard/c-ext/decompressoriterator.c @ 30895:c32454d69b85
zstd: vendor python-zstandard 0.7.0
Commit 3054ae3a66112970a091d3939fee32c2d0c1a23e from
https://github.com/indygreg/python-zstandard is imported without
modifications (other than removing unwanted files).
The vendored zstd library within has been upgraded from 1.1.2 to
1.1.3. This version introduced new APIs for threads, thread
pools, multi-threaded compression, and a new dictionary
builder (COVER). These features are not yet used by
python-zstandard (or Mercurial for that matter). However,
that will likely change in the next python-zstandard release
(and I think there are opportunities for Mercurial to take
advantage of the multi-threaded APIs).
Relevant to Mercurial, the CFFI bindings are now fully
implemented. This means zstd should "just work" with PyPy
(although I haven't tried). The python-zstandard test suite also
runs all tests against both the C extension and CFFI bindings to
ensure feature parity.
There is also a "decompress_content_dict_chain()" API. This was
derived from discussions with Yann Collet on list about alternate
ways of encoding delta chains.
The change most relevant to Mercurial is a performance enhancement in
the simple decompression API to reuse a data structure across
operations. This makes decompression of multiple inputs significantly
faster. (This scenario occurs when reading revlog delta chains, for
example.)
Using python-zstandard's bench.py to measure the performance
difference...
On changelog chunks in the mozilla-unified repo:
decompress discrete decompress() reuse zctx
1.262243 wall; 1.260000 CPU; 1.260000 user; 0.000000 sys 170.43 MB/s (best of 3)
0.949106 wall; 0.950000 CPU; 0.950000 user; 0.000000 sys 226.66 MB/s (best of 4)
decompress discrete dict decompress() reuse zctx
0.692170 wall; 0.690000 CPU; 0.690000 user; 0.000000 sys 310.80 MB/s (best of 5)
0.437088 wall; 0.440000 CPU; 0.440000 user; 0.000000 sys 492.17 MB/s (best of 7)
On manifest chunks in the mozilla-unified repo:
decompress discrete decompress() reuse zctx
1.367284 wall; 1.370000 CPU; 1.370000 user; 0.000000 sys 274.01 MB/s (best of 3)
1.086831 wall; 1.080000 CPU; 1.080000 user; 0.000000 sys 344.72 MB/s (best of 3)
decompress discrete dict decompress() reuse zctx
0.993272 wall; 0.990000 CPU; 0.990000 user; 0.000000 sys 377.19 MB/s (best of 3)
0.678651 wall; 0.680000 CPU; 0.680000 user; 0.000000 sys 552.06 MB/s (best of 5)
That should make reads on zstd revlogs a bit faster ;)
# no-check-commit
author | Gregory Szorc <gregory.szorc@gmail.com> |
---|---|
date | Tue, 07 Feb 2017 23:24:47 -0800 |
parents | b86a448a2965 |
children | e0dc40530c5a |
line wrap: on
line source
/** * Copyright (c) 2016-present, Gregory Szorc * All rights reserved. * * This software may be modified and distributed under the terms * of the BSD license. See the LICENSE file for details. */ #include "python-zstandard.h" #define min(a, b) (((a) < (b)) ? (a) : (b)) extern PyObject* ZstdError; PyDoc_STRVAR(ZstdDecompressorIterator__doc__, "Represents an iterator of decompressed data.\n" ); static void ZstdDecompressorIterator_dealloc(ZstdDecompressorIterator* self) { Py_XDECREF(self->decompressor); Py_XDECREF(self->reader); if (self->buffer) { PyBuffer_Release(self->buffer); PyMem_FREE(self->buffer); self->buffer = NULL; } if (self->dstream) { ZSTD_freeDStream(self->dstream); self->dstream = NULL; } if (self->input.src) { PyMem_Free((void*)self->input.src); self->input.src = NULL; } PyObject_Del(self); } static PyObject* ZstdDecompressorIterator_iter(PyObject* self) { Py_INCREF(self); return self; } static DecompressorIteratorResult read_decompressor_iterator(ZstdDecompressorIterator* self) { size_t zresult; PyObject* chunk; DecompressorIteratorResult result; size_t oldInputPos = self->input.pos; result.chunk = NULL; chunk = PyBytes_FromStringAndSize(NULL, self->outSize); if (!chunk) { result.errored = 1; return result; } self->output.dst = PyBytes_AsString(chunk); self->output.size = self->outSize; self->output.pos = 0; Py_BEGIN_ALLOW_THREADS zresult = ZSTD_decompressStream(self->dstream, &self->output, &self->input); Py_END_ALLOW_THREADS /* We're done with the pointer. Nullify to prevent anyone from getting a handle on a Python object. */ self->output.dst = NULL; if (ZSTD_isError(zresult)) { Py_DECREF(chunk); PyErr_Format(ZstdError, "zstd decompress error: %s", ZSTD_getErrorName(zresult)); result.errored = 1; return result; } self->readCount += self->input.pos - oldInputPos; /* Frame is fully decoded. Input exhausted and output sitting in buffer. */ if (0 == zresult) { self->finishedInput = 1; self->finishedOutput = 1; } /* If it produced output data, return it. */ if (self->output.pos) { if (self->output.pos < self->outSize) { if (_PyBytes_Resize(&chunk, self->output.pos)) { result.errored = 1; return result; } } } else { Py_DECREF(chunk); chunk = NULL; } result.errored = 0; result.chunk = chunk; return result; } static PyObject* ZstdDecompressorIterator_iternext(ZstdDecompressorIterator* self) { PyObject* readResult = NULL; char* readBuffer; Py_ssize_t readSize; Py_ssize_t bufferRemaining; DecompressorIteratorResult result; if (self->finishedOutput) { PyErr_SetString(PyExc_StopIteration, "output flushed"); return NULL; } /* If we have data left in the input, consume it. */ if (self->input.pos < self->input.size) { result = read_decompressor_iterator(self); if (result.chunk || result.errored) { return result.chunk; } /* Else fall through to get more data from input. */ } read_from_source: if (!self->finishedInput) { if (self->reader) { readResult = PyObject_CallMethod(self->reader, "read", "I", self->inSize); if (!readResult) { return NULL; } PyBytes_AsStringAndSize(readResult, &readBuffer, &readSize); } else { assert(self->buffer && self->buffer->buf); /* Only support contiguous C arrays for now */ assert(self->buffer->strides == NULL && self->buffer->suboffsets == NULL); assert(self->buffer->itemsize == 1); /* TODO avoid memcpy() below */ readBuffer = (char *)self->buffer->buf + self->bufferOffset; bufferRemaining = self->buffer->len - self->bufferOffset; readSize = min(bufferRemaining, (Py_ssize_t)self->inSize); self->bufferOffset += readSize; } if (readSize) { if (!self->readCount && self->skipBytes) { assert(self->skipBytes < self->inSize); if ((Py_ssize_t)self->skipBytes >= readSize) { PyErr_SetString(PyExc_ValueError, "skip_bytes larger than first input chunk; " "this scenario is currently unsupported"); Py_DecRef(readResult); return NULL; } readBuffer = readBuffer + self->skipBytes; readSize -= self->skipBytes; } /* Copy input into previously allocated buffer because it can live longer than a single function call and we don't want to keep a ref to a Python object around. This could be changed... */ memcpy((void*)self->input.src, readBuffer, readSize); self->input.size = readSize; self->input.pos = 0; } /* No bytes on first read must mean an empty input stream. */ else if (!self->readCount) { self->finishedInput = 1; self->finishedOutput = 1; Py_DecRef(readResult); PyErr_SetString(PyExc_StopIteration, "empty input"); return NULL; } else { self->finishedInput = 1; } /* We've copied the data managed by memory. Discard the Python object. */ Py_DecRef(readResult); } result = read_decompressor_iterator(self); if (result.errored || result.chunk) { return result.chunk; } /* No new output data. Try again unless we know there is no more data. */ if (!self->finishedInput) { goto read_from_source; } PyErr_SetString(PyExc_StopIteration, "input exhausted"); return NULL; } PyTypeObject ZstdDecompressorIteratorType = { PyVarObject_HEAD_INIT(NULL, 0) "zstd.ZstdDecompressorIterator", /* tp_name */ sizeof(ZstdDecompressorIterator), /* tp_basicsize */ 0, /* tp_itemsize */ (destructor)ZstdDecompressorIterator_dealloc, /* tp_dealloc */ 0, /* tp_print */ 0, /* tp_getattr */ 0, /* tp_setattr */ 0, /* tp_compare */ 0, /* tp_repr */ 0, /* tp_as_number */ 0, /* tp_as_sequence */ 0, /* tp_as_mapping */ 0, /* tp_hash */ 0, /* tp_call */ 0, /* tp_str */ 0, /* tp_getattro */ 0, /* tp_setattro */ 0, /* tp_as_buffer */ Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */ ZstdDecompressorIterator__doc__, /* tp_doc */ 0, /* tp_traverse */ 0, /* tp_clear */ 0, /* tp_richcompare */ 0, /* tp_weaklistoffset */ ZstdDecompressorIterator_iter, /* tp_iter */ (iternextfunc)ZstdDecompressorIterator_iternext, /* tp_iternext */ 0, /* tp_methods */ 0, /* tp_members */ 0, /* tp_getset */ 0, /* tp_base */ 0, /* tp_dict */ 0, /* tp_descr_get */ 0, /* tp_descr_set */ 0, /* tp_dictoffset */ 0, /* tp_init */ 0, /* tp_alloc */ PyType_GenericNew, /* tp_new */ }; void decompressoriterator_module_init(PyObject* mod) { Py_TYPE(&ZstdDecompressorIteratorType) = &PyType_Type; if (PyType_Ready(&ZstdDecompressorIteratorType) < 0) { return; } }