facebook/zstd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fall Back if Derived CParams are Incompatible with DDSS; Refactor CDict Creation

Browse Source 
Rewrite ZSTD_createCDict_advanced() as a wrapper around
ZSTD_createCDict_advanced2(). Evaluate whether to use DDSS mode *after* fully
resolving cparams. If not, fall back.
This commit is contained in:
W. Felix Handte 2020-09-15 14:06:58 -04:00
parent bc6521a6f6
commit eee51a664a
1 changed files with 49 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

101
lib/compress/zstd_compress.c
View File

@ -869,9 +869,7 @@ static ZSTD_compressionParameters ZSTD_dedicatedDictSearch_getCParams(
unsigned long long srcSizeHint, unsigned long long srcSizeHint,
size_t const dictSize); size_t const dictSize);
static int ZSTD_dedicatedDictSearch_isSupported( static int ZSTD_dedicatedDictSearch_isSupported(
int const compressionLevel, const ZSTD_compressionParameters* cParams);
unsigned long long srcSizeHint,
size_t const dictSize);
static void ZSTD_dedicatedDictSearch_revertCParams( static void ZSTD_dedicatedDictSearch_revertCParams(
ZSTD_compressionParameters* cParams); ZSTD_compressionParameters* cParams);
@ -3505,64 +3503,63 @@ static ZSTD_CDict* ZSTD_createCDict_advanced_internal(size_t dictSize,
ZSTD_CDict* ZSTD_createCDict_advanced(const void* dictBuffer, size_t dictSize, ZSTD_CDict* ZSTD_createCDict_advanced(const void* dictBuffer, size_t dictSize,
ZSTD_dictLoadMethod_e dictLoadMethod, ZSTD_dictLoadMethod_e dictLoadMethod,
ZSTD_dictContentType_e dictContentType, ZSTD_dictContentType_e dictContentType,
ZSTD_compressionParameters cParams, ZSTD_customMem customMem) ZSTD_compressionParameters cParams,
ZSTD_customMem customMem)
{ {
DEBUGLOG(3, "ZSTD_createCDict_advanced, mode %u", (unsigned)dictContentType); ZSTD_CCtx_params cctxParams;
if (!customMem.customAlloc ^ !customMem.customFree) return NULL; memset(&cctxParams, 0, sizeof(cctxParams));
ZSTD_CCtxParams_init(&cctxParams, 0);
{ ZSTD_CDict* cdict = ZSTD_createCDict_advanced_internal(dictSize, cctxParams.cParams = cParams;
dictLoadMethod, cParams, cctxParams.customMem = customMem;
customMem); return ZSTD_createCDict_advanced2(
dictBuffer, dictSize,
ZSTD_CCtx_params params; dictLoadMethod, dictContentType,
ZSTD_memset(&params, 0, sizeof(params)); &cctxParams, customMem);
if (ZSTD_isError( ZSTD_initCDict_internal(cdict,
dictBuffer, dictSize,
dictLoadMethod, dictContentType,
cParams, params) )) {
ZSTD_freeCDict(cdict);
return NULL;
}
return cdict;
}
} }
ZSTDLIB_API ZSTD_CDict* ZSTD_createCDict_advanced2( ZSTDLIB_API ZSTD_CDict* ZSTD_createCDict_advanced2(
const void* dict, size_t dictSize, const void* dict, size_t dictSize,
ZSTD_dictLoadMethod_e dictLoadMethod, ZSTD_dictLoadMethod_e dictLoadMethod,
ZSTD_dictContentType_e dictContentType, ZSTD_dictContentType_e dictContentType,
const ZSTD_CCtx_params* cctxParams, const ZSTD_CCtx_params* originalCctxParams,
ZSTD_customMem customMem) ZSTD_customMem customMem)
{ {
int const dedicatedDictSearch = cctxParams->enableDedicatedDictSearch && ZSTD_CCtx_params cctxParams = *originalCctxParams;
ZSTD_dedicatedDictSearch_isSupported( ZSTD_compressionParameters cParams;
cctxParams->compressionLevel, ZSTD_CONTENTSIZE_UNKNOWN, dictSize); ZSTD_CDict* cdict;
if (!dedicatedDictSearch) {
ZSTD_compressionParameters cParams = ZSTD_getCParamsFromCCtxParams(
cctxParams, ZSTD_CONTENTSIZE_UNKNOWN, dictSize);
return ZSTD_createCDict_advanced(dict, dictSize,
dictLoadMethod, dictContentType, cParams,
customMem);
}
{ ZSTD_compressionParameters const cParams = ZSTD_dedicatedDictSearch_getCParams(
cctxParams->compressionLevel, ZSTD_CONTENTSIZE_UNKNOWN, dictSize);
ZSTD_CDict* cdict = ZSTD_createCDict_advanced_internal(dictSize,
dictLoadMethod, cParams,
customMem);
if (ZSTD_isError( ZSTD_initCDict_internal(cdict, DEBUGLOG(3, "ZSTD_createCDict_advanced2, mode %u", (unsigned)dictContentType);
dict, dictSize, if (!customMem.customAlloc ^ !customMem.customFree) return NULL;
dictLoadMethod, dictContentType,
cParams, *cctxParams) )) {
ZSTD_freeCDict(cdict);
return NULL;
}
return cdict; if (cctxParams.enableDedicatedDictSearch) {
cParams = ZSTD_dedicatedDictSearch_getCParams(
cctxParams.compressionLevel, ZSTD_CONTENTSIZE_UNKNOWN, dictSize);
ZSTD_overrideCParams(&cParams, &cctxParams.cParams);
} else {
cParams = ZSTD_getCParamsFromCCtxParams(
&cctxParams, ZSTD_CONTENTSIZE_UNKNOWN, dictSize);
} }
if (!ZSTD_dedicatedDictSearch_isSupported(&cParams)) {
/* Fall back to non-DDSS params */
cctxParams.enableDedicatedDictSearch = 0;
cParams = ZSTD_getCParamsFromCCtxParams(
&cctxParams, ZSTD_CONTENTSIZE_UNKNOWN, dictSize);
}
cdict = ZSTD_createCDict_advanced_internal(dictSize,
dictLoadMethod, cParams,
customMem);
if (ZSTD_isError( ZSTD_initCDict_internal(cdict,
dict, dictSize,
dictLoadMethod, dictContentType,
cParams, cctxParams) )) {
ZSTD_freeCDict(cdict);
return NULL;
}
return cdict;
} }
ZSTD_CDict* ZSTD_createCDict(const void* dict, size_t dictSize, int compressionLevel) ZSTD_CDict* ZSTD_createCDict(const void* dict, size_t dictSize, int compressionLevel)
@ -4368,10 +4365,10 @@ static ZSTD_compressionParameters ZSTD_dedicatedDictSearch_getCParams(int const
return cParams; return cParams;
} }
static int ZSTD_dedicatedDictSearch_isSupported(int const compressionLevel, unsigned long long srcSizeHint, size_t const dictSize) static int ZSTD_dedicatedDictSearch_isSupported(
ZSTD_compressionParameters const* cParams)
{ {
ZSTD_compressionParameters const cParams = ZSTD_dedicatedDictSearch_getCParams(compressionLevel, srcSizeHint, dictSize); return (cParams->strategy >= ZSTD_greedy) && (cParams->strategy <= ZSTD_lazy2);
return (cParams.strategy >= ZSTD_greedy) && (cParams.strategy <= ZSTD_lazy2);
} }
/** /**