From: Paul Cruz Date: Wed, 19 Jul 2017 18:51:50 +0000 (-0700) Subject: removed previous version of completion for compression X-Git-Tag: v1.3.1^2~13^2^2~42 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6945b3c43d5be449d0bd1ff06c40bca2e5230fa3;p=thirdparty%2Fzstd.git removed previous version of completion for compression --- diff --git a/lib/compress/zstd_compress.c b/lib/compress/zstd_compress.c index 0c8edecec..90002c2c4 100644 --- a/lib/compress/zstd_compress.c +++ b/lib/compress/zstd_compress.c @@ -140,9 +140,6 @@ struct ZSTD_CCtx_s { /* Multi-threading */ U32 nbThreads; ZSTDMT_CCtx* mtctx; - - /* adaptive compression */ - double completion; }; @@ -2848,7 +2845,6 @@ static size_t ZSTD_compress_frameChunk (ZSTD_CCtx* cctx, BYTE* op = ostart; U32 const maxDist = 1 << cctx->appliedParams.cParams.windowLog; - cctx->completion = 0; if (cctx->appliedParams.fParams.checksumFlag && srcSize) XXH64_update(&cctx->xxhState, src, srcSize); @@ -2899,7 +2895,6 @@ static size_t ZSTD_compress_frameChunk (ZSTD_CCtx* cctx, } remaining -= blockSize; - cctx->completion = 1 - (double)remaining/srcSize; dstCapacity -= cSize; ip += blockSize; op += cSize; @@ -3002,11 +2997,6 @@ static size_t ZSTD_compressContinue_internal (ZSTD_CCtx* cctx, return fhSize; } -ZSTDLIB_API double ZSTD_getCompletion(ZSTD_CCtx* cctx) -{ - return cctx->completion; -} - size_t ZSTD_compressContinue (ZSTD_CCtx* cctx, void* dst, size_t dstCapacity, const void* src, size_t srcSize) diff --git a/lib/zstd.h b/lib/zstd.h index e835ad3a7..6d69d94e6 100644 --- a/lib/zstd.h +++ b/lib/zstd.h @@ -808,11 +808,6 @@ ZSTDLIB_API size_t ZSTD_copyCCtx(ZSTD_CCtx* cctx, const ZSTD_CCtx* preparedCCtx, ZSTDLIB_API size_t ZSTD_compressContinue(ZSTD_CCtx* cctx, void* dst, size_t dstCapacity, const void* src, size_t srcSize); ZSTDLIB_API size_t ZSTD_compressEnd(ZSTD_CCtx* cctx, void* dst, size_t dstCapacity, const void* src, size_t srcSize); -/*! ZSTD_getCompletion: get a double representing how much of a file/buffer has been compressed - * using ZSTD_compressContinue() - * return: a double value in the range of 0 to 1 representing how much a compression job has finished - */ -ZSTDLIB_API double ZSTD_getCompletion(ZSTD_CCtx* cctx); /*- Buffer-less streaming decompression (synchronous mode)