better dynamic memory adaptation when using CLI

This commit is contained in:
Yann Collet 2016-06-04 00:09:02 +02:00
parent f4f5affdf7
commit 0d31160b4e
2 changed files with 6 additions and 1 deletions

2
NEWS
View File

@ -1,10 +1,12 @@
v0.7.0 v0.7.0
New : Support for directory compression, using `-r`, thanks to Przemyslaw Skibinski New : Support for directory compression, using `-r`, thanks to Przemyslaw Skibinski
New : Support for Sparse File-systems (do not use space for zero-filled sectors) New : Support for Sparse File-systems (do not use space for zero-filled sectors)
New : Frame checksum support
New : Support pass-through mode (when using `-df`) New : Support pass-through mode (when using `-df`)
New : API : dictionary files from custom content, by Giuseppe Ottaviano New : API : dictionary files from custom content, by Giuseppe Ottaviano
New : API support for custom malloc/free functions New : API support for custom malloc/free functions
New : controllable Dictionary ID New : controllable Dictionary ID
New : Support for skippable frames
v0.6.1 v0.6.1
New : zlib wrapper API, thanks to Przemyslaw Skibinski New : zlib wrapper API, thanks to Przemyslaw Skibinski

View File

@ -317,7 +317,10 @@ static int FIO_compressFilename_internal(cRess_t ress,
params.fParams.contentSizeFlag = 1; params.fParams.contentSizeFlag = 1;
params.fParams.checksumFlag = g_checksumFlag; params.fParams.checksumFlag = g_checksumFlag;
params.fParams.noDictIDFlag = !g_dictIDFlag; params.fParams.noDictIDFlag = !g_dictIDFlag;
if (g_maxWLog) if (params.cParams.windowLog > g_maxWLog) params.cParams.windowLog = g_maxWLog; if ((g_maxWLog) && (params.cParams.windowLog > g_maxWLog)) {
params.cParams.windowLog = g_maxWLog;
params.cParams = ZSTD_adjustCParams(params.cParams, fileSize, ress.dictBufferSize);
}
{ size_t const errorCode = ZBUFF_compressInit_advanced(ress.ctx, ress.dictBuffer, ress.dictBufferSize, params, fileSize); { size_t const errorCode = ZBUFF_compressInit_advanced(ress.ctx, ress.dictBuffer, ress.dictBufferSize, params, fileSize);
if (ZBUFF_isError(errorCode)) EXM_THROW(21, "Error initializing compression : %s", ZBUFF_getErrorName(errorCode)); if (ZBUFF_isError(errorCode)) EXM_THROW(21, "Error initializing compression : %s", ZBUFF_getErrorName(errorCode));
} } } }