Skip to content

Make py_zstd_compress_mt2 thread-safe #321

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
KowalskiThomas wants to merge 1 commit into
base: master
Choose a base branch
from
+12 −6
Open

Make py_zstd_compress_mt2 thread-safe #321

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions src/python-zstd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,9 +203,9 @@ static PyObject *py_zstd_compress_mt2(PyObject* self, PyObject *args)
size_t cSize;
// size_t sum=0;
int32_t level = ZSTD_CLEVEL_DEFAULT;
static int32_t lastLevel =0;
int32_t threads = 0;
int32_t strict = 0;
ZSTD_CCtx* cctx = NULL;

#if PY_MAJOR_VERSION >= 3
if (!PyArg_ParseTuple(args, "y#|iii", &source, &source_size, &level, &threads, &strict))
Expand Down Expand Up @@ -272,14 +272,20 @@ static PyObject *py_zstd_compress_mt2(PyObject* self, PyObject *args)
if (source_size >= 0) {
dest = PyBytes_AS_STRING(result);

if(level != lastLevel) {
reset_cContext(threads, level);
}
cctx = ZSTD_createCCtx();
if (cctx == NULL) {
PyErr_Format(ZstdError, "Could not create compression context");
Py_CLEAR(result);
return NULL;
}
ZSTD_CCtx_setParameter(cctx, ZSTD_c_compressionLevel, level);
ZSTD_CCtx_setParameter(cctx, ZSTD_c_nbWorkers, threads);

Py_BEGIN_ALLOW_THREADS
cSize = ZSTD_compress2(m_cctx, dest, (size_t)dest_size, source, (size_t)source_size);
cSize = ZSTD_compress2(cctx, dest, (size_t)dest_size, source, (size_t)source_size);
Py_END_ALLOW_THREADS
lastLevel = level;

ZSTD_freeCCtx(cctx);

printdn("Compression result: %d\n", cSize);
if (ZSTD_isError(cSize)) {
Expand Down