ddidderr/zstd-rs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #906 from facebook/fixAutoPledge

Browse Source 
fix : ZSTD_compress_generic(,,,ZSTD_e_end) automatically sets pledgedSrcSize
This commit is contained in:
Yann Collet
2017-11-02 10:14:20 -07:00
committed by GitHub
parent 6d3987b93a 6f1dfa8adf
commit d0ffd398d2
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/compress/zstd_compress.c
+1
View File
@@ -2814,6 +2814,7 @@ size_t ZSTD_compress_generic (ZSTD_CCtx* cctx,
if (cctx->streamStage == zcss_init) { if (cctx->streamStage == zcss_init) {
ZSTD_prefixDict const prefixDict = cctx->prefixDict; ZSTD_prefixDict const prefixDict = cctx->prefixDict;
ZSTD_CCtx_params params = cctx->requestedParams; ZSTD_CCtx_params params = cctx->requestedParams;
if (endOp == ZSTD_e_end) cctx->pledgedSrcSizePlusOne = input->size + 1;
params.cParams = ZSTD_getCParamsFromCCtxParams( params.cParams = ZSTD_getCParamsFromCCtxParams(
cctx->requestedParams, cctx->pledgedSrcSizePlusOne-1, 0 /*dictSize*/); cctx->requestedParams, cctx->pledgedSrcSizePlusOne-1, 0 /*dictSize*/);
memset(&cctx->prefixDict, 0, sizeof(cctx->prefixDict)); /* single usage */ memset(&cctx->prefixDict, 0, sizeof(cctx->prefixDict)); /* single usage */
programs/bench.c
+9
View File
@@ -305,6 +305,14 @@ static int BMK_benchMem(const void* srcBuffer, size_t srcSize,
do { do {
U32 blockNb; U32 blockNb;
for (blockNb=0; blockNb<nbBlocks; blockNb++) { for (blockNb=0; blockNb<nbBlocks; blockNb++) {
#if 0 /* direct compression function, for occasional comparison */
ZSTD_parameters const params = ZSTD_getParams(cLevel, blockTable[blockNb].srcSize, dictBufferSize);
blockTable[blockNb].cSize = ZSTD_compress_advanced(ctx,
blockTable[blockNb].cPtr, blockTable[blockNb].cRoom,
blockTable[blockNb].srcPtr, blockTable[blockNb].srcSize,
dictBuffer, dictBufferSize,
params);
#else
size_t moreToFlush = 1; size_t moreToFlush = 1;
ZSTD_outBuffer out; ZSTD_outBuffer out;
ZSTD_inBuffer in; ZSTD_inBuffer in;
@@ -322,6 +330,7 @@ static int BMK_benchMem(const void* srcBuffer, size_t srcSize,
ZSTD_getErrorName(moreToFlush)); ZSTD_getErrorName(moreToFlush));
} }
blockTable[blockNb].cSize = out.pos; blockTable[blockNb].cSize = out.pos;
#endif
} }
nbLoops++; nbLoops++;
} while (UTIL_clockSpanMicro(clockStart) < clockLoop); } while (UTIL_clockSpanMicro(clockStart) < clockLoop);