AuroraMiddleware/zstd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

added control stage to MT mode

Browse Source
This commit is contained in:
Yann Collet 2017-06-11 18:32:36 -07:00
parent f35e2de61c
commit 23aace9778
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/compress/zstd_compress.c
View File

@ -3762,13 +3762,15 @@ size_t ZSTD_compress_generic (ZSTD_CCtx* cctx,
cctx->frameContentSize, 0 /* dictSize */); cctx->frameContentSize, 0 /* dictSize */);
if (cctx->nbThreads > 1) { if (cctx->nbThreads > 1) {
CHECK_F( ZSTDMT_initCStream_internal(cctx->mtctx, NULL, 0, cctx->cdict, params, cctx->frameContentSize) ); CHECK_F( ZSTDMT_initCStream_internal(cctx->mtctx, NULL, 0, cctx->cdict, params, cctx->frameContentSize) );
cctx->streamStage = zcss_load;
} else { } else {
CHECK_F( ZSTD_resetCStream_internal(cctx, params, cctx->frameContentSize) ); CHECK_F( ZSTD_resetCStream_internal(cctx, params, cctx->frameContentSize) );
} } } }
if (cctx->nbThreads > 1) { if (cctx->nbThreads > 1) {
DEBUGLOG(5, "starting ZSTDMT_compressStream_generic"); size_t const flushMin = ZSTDMT_compressStream_generic(cctx->mtctx, output, input, endOp);
return ZSTDMT_compressStream_generic(cctx->mtctx, output, input, endOp) ; if (ZSTD_isError(flushMin)) cctx->streamStage = zcss_init;
return flushMin;
} }
DEBUGLOG(5, "starting ZSTD_compressStream_generic"); DEBUGLOG(5, "starting ZSTD_compressStream_generic");

8
lib/compress/zstdmt_compress.c
View File

@ -851,11 +851,11 @@ size_t ZSTDMT_endStream(ZSTDMT_CCtx* zcs, ZSTD_outBuffer* output)
} }
size_t ZSTDMT_compressStream_generic(ZSTDMT_CCtx* mtctx, size_t ZSTDMT_compressStream_generic(ZSTDMT_CCtx* mtctx,
ZSTD_outBuffer* output, ZSTD_outBuffer* output,
ZSTD_inBuffer* input, ZSTD_inBuffer* input,
ZSTD_EndDirective endOp) ZSTD_EndDirective endOp)
{ {
CHECK_F (ZSTDMT_compressStream(mtctx, output, input)); CHECK_F(ZSTDMT_compressStream(mtctx, output, input));
switch(endOp) switch(endOp)
{ {
case ZSTD_e_flush: case ZSTD_e_flush: