Mercurial > hg
view contrib/python-zstandard/c-ext/compressobj.c @ 36747:4c71a26a4009
sslutil: some more forcebytes() on some exception messages
At this point, test-https.t no longer dumps tracebacks
everywhere. Instead, we get some results that look like we're not
adequately finding things in hg's configuration, which should be
manageable (if somewhat annoying to find and fix.)
Differential Revision: https://phab.mercurial-scm.org/D2690
author | Augie Fackler <augie@google.com> |
---|---|
date | Sun, 04 Mar 2018 21:16:36 -0500 |
parents | e0dc40530c5a |
children | b1fb341d8a61 |
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" extern PyObject* ZstdError; PyDoc_STRVAR(ZstdCompressionObj__doc__, "Perform compression using a standard library compatible API.\n" ); static void ZstdCompressionObj_dealloc(ZstdCompressionObj* self) { PyMem_Free(self->output.dst); self->output.dst = NULL; Py_XDECREF(self->compressor); PyObject_Del(self); } static PyObject* ZstdCompressionObj_compress(ZstdCompressionObj* self, PyObject* args) { const char* source; Py_ssize_t sourceSize; ZSTD_inBuffer input; size_t zresult; PyObject* result = NULL; Py_ssize_t resultSize = 0; if (self->finished) { PyErr_SetString(ZstdError, "cannot call compress() after compressor finished"); return NULL; } #if PY_MAJOR_VERSION >= 3 if (!PyArg_ParseTuple(args, "y#:compress", &source, &sourceSize)) { #else if (!PyArg_ParseTuple(args, "s#:compress", &source, &sourceSize)) { #endif return NULL; } input.src = source; input.size = sourceSize; input.pos = 0; while ((ssize_t)input.pos < sourceSize) { Py_BEGIN_ALLOW_THREADS if (self->compressor->mtcctx) { zresult = ZSTDMT_compressStream(self->compressor->mtcctx, &self->output, &input); } else { zresult = ZSTD_compressStream(self->compressor->cstream, &self->output, &input); } Py_END_ALLOW_THREADS if (ZSTD_isError(zresult)) { PyErr_Format(ZstdError, "zstd compress error: %s", ZSTD_getErrorName(zresult)); return NULL; } if (self->output.pos) { if (result) { resultSize = PyBytes_GET_SIZE(result); if (-1 == _PyBytes_Resize(&result, resultSize + self->output.pos)) { return NULL; } memcpy(PyBytes_AS_STRING(result) + resultSize, self->output.dst, self->output.pos); } else { result = PyBytes_FromStringAndSize(self->output.dst, self->output.pos); if (!result) { return NULL; } } self->output.pos = 0; } } if (result) { return result; } else { return PyBytes_FromString(""); } } static PyObject* ZstdCompressionObj_flush(ZstdCompressionObj* self, PyObject* args) { int flushMode = compressorobj_flush_finish; size_t zresult; PyObject* result = NULL; Py_ssize_t resultSize = 0; if (!PyArg_ParseTuple(args, "|i:flush", &flushMode)) { return NULL; } if (flushMode != compressorobj_flush_finish && flushMode != compressorobj_flush_block) { PyErr_SetString(PyExc_ValueError, "flush mode not recognized"); return NULL; } if (self->finished) { PyErr_SetString(ZstdError, "compressor object already finished"); return NULL; } assert(self->output.pos == 0); if (flushMode == compressorobj_flush_block) { /* The output buffer is of size ZSTD_CStreamOutSize(), which is guaranteed to hold a full block. */ Py_BEGIN_ALLOW_THREADS if (self->compressor->mtcctx) { zresult = ZSTDMT_flushStream(self->compressor->mtcctx, &self->output); } else { zresult = ZSTD_flushStream(self->compressor->cstream, &self->output); } Py_END_ALLOW_THREADS if (ZSTD_isError(zresult)) { PyErr_Format(ZstdError, "zstd compress error: %s", ZSTD_getErrorName(zresult)); return NULL; } /* Output buffer is guaranteed to hold full block. */ assert(zresult == 0); if (self->output.pos) { result = PyBytes_FromStringAndSize(self->output.dst, self->output.pos); if (!result) { return NULL; } } self->output.pos = 0; if (result) { return result; } else { return PyBytes_FromString(""); } } assert(flushMode == compressorobj_flush_finish); self->finished = 1; while (1) { if (self->compressor->mtcctx) { zresult = ZSTDMT_endStream(self->compressor->mtcctx, &self->output); } else { zresult = ZSTD_endStream(self->compressor->cstream, &self->output); } if (ZSTD_isError(zresult)) { PyErr_Format(ZstdError, "error ending compression stream: %s", ZSTD_getErrorName(zresult)); return NULL; } if (self->output.pos) { if (result) { resultSize = PyBytes_GET_SIZE(result); if (-1 == _PyBytes_Resize(&result, resultSize + self->output.pos)) { return NULL; } memcpy(PyBytes_AS_STRING(result) + resultSize, self->output.dst, self->output.pos); } else { result = PyBytes_FromStringAndSize(self->output.dst, self->output.pos); if (!result) { return NULL; } } self->output.pos = 0; } if (!zresult) { break; } } if (result) { return result; } else { return PyBytes_FromString(""); } } static PyMethodDef ZstdCompressionObj_methods[] = { { "compress", (PyCFunction)ZstdCompressionObj_compress, METH_VARARGS, PyDoc_STR("compress data") }, { "flush", (PyCFunction)ZstdCompressionObj_flush, METH_VARARGS, PyDoc_STR("finish compression operation") }, { NULL, NULL } }; PyTypeObject ZstdCompressionObjType = { PyVarObject_HEAD_INIT(NULL, 0) "zstd.ZstdCompressionObj", /* tp_name */ sizeof(ZstdCompressionObj), /* tp_basicsize */ 0, /* tp_itemsize */ (destructor)ZstdCompressionObj_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 */ ZstdCompressionObj__doc__, /* tp_doc */ 0, /* tp_traverse */ 0, /* tp_clear */ 0, /* tp_richcompare */ 0, /* tp_weaklistoffset */ 0, /* tp_iter */ 0, /* tp_iternext */ ZstdCompressionObj_methods, /* 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 compressobj_module_init(PyObject* module) { Py_TYPE(&ZstdCompressionObjType) = &PyType_Type; if (PyType_Ready(&ZstdCompressionObjType) < 0) { return; } }