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

Merge branch 'dev' of github.com:facebook/zstd into dev

dev
Yann Collet 2017-04-27 17:29:52 -07:00
parent 36e79a1a1f aca392610b
commit b636133932
4 changed files with 85 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
contrib/linux-kernel/include/linux/zstd.h
View File

@ -202,7 +202,7 @@ ZSTD_parameters ZSTD_getParams(int compressionLevel,
**************************************/ **************************************/
/** /**
* ZSTD_CCtxWorkspaceBound() - the amount of memory needed to create a ZSTD_CCtx * ZSTD_CCtxWorkspaceBound() - amount of memory needed to initialize a ZSTD_CCtx
* @cParams: The compression parameters to be used for compression. * @cParams: The compression parameters to be used for compression.
* *
* If multiple compression parameters might be used, the caller must call * If multiple compression parameters might be used, the caller must call
@ -210,7 +210,7 @@ ZSTD_parameters ZSTD_getParams(int compressionLevel,
* size. * size.
* *
* Return: A lower bound on the size of the workspace that is passed to * Return: A lower bound on the size of the workspace that is passed to
* ZSTD_createCCtx(). * ZSTD_initCCtx().
*/ */
size_t ZSTD_CCtxWorkspaceBound(ZSTD_compressionParameters cParams); size_t ZSTD_CCtxWorkspaceBound(ZSTD_compressionParameters cParams);
@ -222,7 +222,7 @@ size_t ZSTD_CCtxWorkspaceBound(ZSTD_compressionParameters cParams);
*/ */
typedef struct ZSTD_CCtx_s ZSTD_CCtx; typedef struct ZSTD_CCtx_s ZSTD_CCtx;
/** /**
* ZSTD_createCCtx() - create a zstd compression context * ZSTD_initCCtx() - initialize a zstd compression context
* @workspace: The workspace to emplace the context into. It must outlive * @workspace: The workspace to emplace the context into. It must outlive
* the returned context. * the returned context.
* @workspaceSize: The size of workspace. Use ZSTD_CCtxWorkspaceBound() to * @workspaceSize: The size of workspace. Use ZSTD_CCtxWorkspaceBound() to
@ -230,12 +230,12 @@ typedef struct ZSTD_CCtx_s ZSTD_CCtx;
* *
* Return: A compression context emplaced into workspace. * Return: A compression context emplaced into workspace.
*/ */
ZSTD_CCtx *ZSTD_createCCtx(void *workspace, size_t workspaceSize); ZSTD_CCtx *ZSTD_initCCtx(void *workspace, size_t workspaceSize);
/** /**
* ZSTD_compressCCtx() - compress src into dst * ZSTD_compressCCtx() - compress src into dst
* @ctx: The context. Must have been created with a workspace at least * @ctx: The context. Must have been initialized with a workspace at
* as large as ZSTD_CCtxWorkspaceBound(params.cParams). * least as large as ZSTD_CCtxWorkspaceBound(params.cParams).
* @dst: The buffer to compress src into. * @dst: The buffer to compress src into.
* @dstCapacity: The size of the destination buffer. May be any size, but * @dstCapacity: The size of the destination buffer. May be any size, but
* ZSTD_compressBound(srcSize) is guaranteed to be large enough. * ZSTD_compressBound(srcSize) is guaranteed to be large enough.
@ -250,10 +250,10 @@ size_t ZSTD_compressCCtx(ZSTD_CCtx *ctx, void *dst, size_t dstCapacity,
const void *src, size_t srcSize, ZSTD_parameters params); const void *src, size_t srcSize, ZSTD_parameters params);
/** /**
* ZSTD_DCtxWorkspaceBound() - the amount of memory needed to create a ZSTD_DCtx * ZSTD_DCtxWorkspaceBound() - amount of memory needed to initialize a ZSTD_DCtx
* *
* Return: A lower bound on the size of the workspace that is passed to * Return: A lower bound on the size of the workspace that is passed to
* ZSTD_createDCtx(). * ZSTD_initDCtx().
*/ */
size_t ZSTD_DCtxWorkspaceBound(void); size_t ZSTD_DCtxWorkspaceBound(void);
@ -265,7 +265,7 @@ size_t ZSTD_DCtxWorkspaceBound(void);
*/ */
typedef struct ZSTD_DCtx_s ZSTD_DCtx; typedef struct ZSTD_DCtx_s ZSTD_DCtx;
/** /**
* ZSTD_createDCtx() - create a zstd decompression context * ZSTD_initDCtx() - initialize a zstd decompression context
* @workspace: The workspace to emplace the context into. It must outlive * @workspace: The workspace to emplace the context into. It must outlive
* the returned context. * the returned context.
* @workspaceSize: The size of workspace. Use ZSTD_DCtxWorkspaceBound() to * @workspaceSize: The size of workspace. Use ZSTD_DCtxWorkspaceBound() to
@ -273,7 +273,7 @@ typedef struct ZSTD_DCtx_s ZSTD_DCtx;
* *
* Return: A decompression context emplaced into workspace. * Return: A decompression context emplaced into workspace.
*/ */
ZSTD_DCtx *ZSTD_createDCtx(void *workspace, size_t workspaceSize); ZSTD_DCtx *ZSTD_initDCtx(void *workspace, size_t workspaceSize);
/** /**
* ZSTD_decompressDCtx() - decompress zstd compressed src into dst * ZSTD_decompressDCtx() - decompress zstd compressed src into dst
@ -298,8 +298,8 @@ size_t ZSTD_decompressDCtx(ZSTD_DCtx *ctx, void *dst, size_t dstCapacity,
/** /**
* ZSTD_compress_usingDict() - compress src into dst using a dictionary * ZSTD_compress_usingDict() - compress src into dst using a dictionary
* @ctx: The context. Must have been created with a workspace at least * @ctx: The context. Must have been initialized with a workspace at
* as large as ZSTD_CCtxWorkspaceBound(params.cParams). * least as large as ZSTD_CCtxWorkspaceBound(params.cParams).
* @dst: The buffer to compress src into. * @dst: The buffer to compress src into.
* @dstCapacity: The size of the destination buffer. May be any size, but * @dstCapacity: The size of the destination buffer. May be any size, but
* ZSTD_compressBound(srcSize) is guaranteed to be large enough. * ZSTD_compressBound(srcSize) is guaranteed to be large enough.
@ -344,11 +344,11 @@ size_t ZSTD_decompress_usingDict(ZSTD_DCtx *ctx, void *dst, size_t dstCapacity,
***************************/ ***************************/
/** /**
* ZSTD_CDictWorkspaceBound() - amount of memory needed to create a ZSTD_CDict * ZSTD_CDictWorkspaceBound() - memory needed to initialize a ZSTD_CDict
* @cParams: The compression parameters to be used for compression. * @cParams: The compression parameters to be used for compression.
* *
* Return: A lower bound on the size of the workspace that is passed to * Return: A lower bound on the size of the workspace that is passed to
* ZSTD_createCDict(). * ZSTD_initCDict().
*/ */
size_t ZSTD_CDictWorkspaceBound(ZSTD_compressionParameters cParams); size_t ZSTD_CDictWorkspaceBound(ZSTD_compressionParameters cParams);
@ -358,7 +358,7 @@ size_t ZSTD_CDictWorkspaceBound(ZSTD_compressionParameters cParams);
typedef struct ZSTD_CDict_s ZSTD_CDict; typedef struct ZSTD_CDict_s ZSTD_CDict;
/** /**
* ZSTD_createCDict() - create a digested dictionary for compression * ZSTD_initCDict() - initialize a digested dictionary for compression
* @dictBuffer: The dictionary to digest. The buffer is referenced by the * @dictBuffer: The dictionary to digest. The buffer is referenced by the
* ZSTD_CDict so it must outlive the returned ZSTD_CDict. * ZSTD_CDict so it must outlive the returned ZSTD_CDict.
* @dictSize: The size of the dictionary. * @dictSize: The size of the dictionary.
@ -373,14 +373,15 @@ typedef struct ZSTD_CDict_s ZSTD_CDict;
* *
* Return: The digested dictionary emplaced into workspace. * Return: The digested dictionary emplaced into workspace.
*/ */
ZSTD_CDict *ZSTD_createCDict(const void *dictBuffer, size_t dictSize, ZSTD_CDict *ZSTD_initCDict(const void *dictBuffer, size_t dictSize,
ZSTD_parameters params, void *workspace, size_t workspaceSize); ZSTD_parameters params, void *workspace, size_t workspaceSize);
/** /**
* ZSTD_compress_usingCDict() - compress src into dst using a ZSTD_CDict * ZSTD_compress_usingCDict() - compress src into dst using a ZSTD_CDict
* @ctx: The context. Must have been created with a workspace at least * @ctx: The context. Must have been initialized with a workspace at
* as large as ZSTD_CCtxWorkspaceBound(cParams) where cParams are * least as large as ZSTD_CCtxWorkspaceBound(cParams) where
* the compression parameters used to create cdict. * cParams are the compression parameters used to initialize the
* cdict.
* @dst: The buffer to compress src into. * @dst: The buffer to compress src into.
* @dstCapacity: The size of the destination buffer. May be any size, but * @dstCapacity: The size of the destination buffer. May be any size, but
* ZSTD_compressBound(srcSize) is guaranteed to be large enough. * ZSTD_compressBound(srcSize) is guaranteed to be large enough.
@ -400,10 +401,10 @@ size_t ZSTD_compress_usingCDict(ZSTD_CCtx *cctx, void *dst, size_t dstCapacity,
/** /**
* ZSTD_DDictWorkspaceBound() - amount of memory needed to create a ZSTD_DDict * ZSTD_DDictWorkspaceBound() - memory needed to initialize a ZSTD_DDict
* *
* Return: A lower bound on the size of the workspace that is passed to * Return: A lower bound on the size of the workspace that is passed to
* ZSTD_createDDict(). * ZSTD_initDDict().
*/ */
size_t ZSTD_DDictWorkspaceBound(void); size_t ZSTD_DDictWorkspaceBound(void);
@ -413,7 +414,7 @@ size_t ZSTD_DDictWorkspaceBound(void);
typedef struct ZSTD_DDict_s ZSTD_DDict; typedef struct ZSTD_DDict_s ZSTD_DDict;
/** /**
* ZSTD_createDDict() - create a digested dictionary for decompression * ZSTD_initDDict() - initialize a digested dictionary for decompression
* @dictBuffer: The dictionary to digest. The buffer is referenced by the * @dictBuffer: The dictionary to digest. The buffer is referenced by the
* ZSTD_DDict so it must outlive the returned ZSTD_DDict. * ZSTD_DDict so it must outlive the returned ZSTD_DDict.
* @dictSize: The size of the dictionary. * @dictSize: The size of the dictionary.
@ -427,7 +428,7 @@ typedef struct ZSTD_DDict_s ZSTD_DDict;
* *
* Return: The digested dictionary emplaced into workspace. * Return: The digested dictionary emplaced into workspace.
*/ */
ZSTD_DDict *ZSTD_createDDict(const void *dictBuffer, size_t dictSize, ZSTD_DDict *ZSTD_initDDict(const void *dictBuffer, size_t dictSize,
void *workspace, size_t workspaceSize); void *workspace, size_t workspaceSize);
/** /**
@ -487,7 +488,7 @@ typedef struct ZSTD_outBuffer_s {
* Streaming compression - HowTo * Streaming compression - HowTo
* *
* A ZSTD_CStream object is required to track streaming operation. * A ZSTD_CStream object is required to track streaming operation.
* Use ZSTD_createCStream() to create and initialize a ZSTD_CStream object. * Use ZSTD_initCStream() to initialize a ZSTD_CStream object.
* ZSTD_CStream objects can be reused multiple times on consecutive compression * ZSTD_CStream objects can be reused multiple times on consecutive compression
* operations. It is recommended to re-use ZSTD_CStream in situations where many * operations. It is recommended to re-use ZSTD_CStream in situations where many
* streaming operations will be achieved consecutively. Use one separate * streaming operations will be achieved consecutively. Use one separate
@ -515,11 +516,11 @@ typedef struct ZSTD_outBuffer_s {
******************************************************************************/ ******************************************************************************/
/** /**
* ZSTD_CStreamWorkspaceBound() - memory needed to create a ZSTD_CStream * ZSTD_CStreamWorkspaceBound() - memory needed to initialize a ZSTD_CStream
* @cParams: The compression parameters to be used for compression. * @cParams: The compression parameters to be used for compression.
* *
* Return: A lower bound on the size of the workspace that is passed to * Return: A lower bound on the size of the workspace that is passed to
* ZSTD_createCStream() and ZSTD_createCStream_usingCDict(). * ZSTD_initCStream() and ZSTD_initCStream_usingCDict().
*/ */
size_t ZSTD_CStreamWorkspaceBound(ZSTD_compressionParameters cParams); size_t ZSTD_CStreamWorkspaceBound(ZSTD_compressionParameters cParams);
@ -530,7 +531,7 @@ typedef struct ZSTD_CStream_s ZSTD_CStream;
/*===== ZSTD_CStream management functions =====*/ /*===== ZSTD_CStream management functions =====*/
/** /**
* ZSTD_createCStream() - create a zstd streaming compression context * ZSTD_initCStream() - initialize a zstd streaming compression context
* @params: The zstd compression parameters. * @params: The zstd compression parameters.
* @pledgedSrcSize: If params.fParams.contentSizeFlag == 1 then the caller must * @pledgedSrcSize: If params.fParams.contentSizeFlag == 1 then the caller must
* pass the source size (zero means empty source). Otherwise, * pass the source size (zero means empty source). Otherwise,
@ -544,23 +545,23 @@ typedef struct ZSTD_CStream_s ZSTD_CStream;
* *
* Return: The zstd streaming compression context. * Return: The zstd streaming compression context.
*/ */
ZSTD_CStream *ZSTD_createCStream(ZSTD_parameters params, ZSTD_CStream *ZSTD_initCStream(ZSTD_parameters params,
unsigned long long pledgedSrcSize, void *workspace, unsigned long long pledgedSrcSize, void *workspace,
size_t workspaceSize); size_t workspaceSize);
/** /**
* ZSTD_createCStream_usingCDict() - create a zstd streaming compression context * ZSTD_initCStream_usingCDict() - initialize a streaming compression context
* @cdict: The digested dictionary to use for compression. * @cdict: The digested dictionary to use for compression.
* @pledgedSrcSize: Optionally the source size, or zero if unknown. * @pledgedSrcSize: Optionally the source size, or zero if unknown.
* @workspace: The workspace to emplace the context into. It must outlive * @workspace: The workspace to emplace the context into. It must outlive
* the returned context. * the returned context.
* @workspaceSize: The size of workspace. Call ZSTD_CStreamWorkspaceBound() * @workspaceSize: The size of workspace. Call ZSTD_CStreamWorkspaceBound()
* with the cParams used to create the cdict to determine how * with the cParams used to initialize the cdict to determine
* large the workspace must be. * how large the workspace must be.
* *
* Return: The zstd streaming compression context. * Return: The zstd streaming compression context.
*/ */
ZSTD_CStream *ZSTD_createCStream_usingCDict(const ZSTD_CDict *cdict, ZSTD_CStream *ZSTD_initCStream_usingCDict(const ZSTD_CDict *cdict,
unsigned long long pledgedSrcSize, void *workspace, unsigned long long pledgedSrcSize, void *workspace,
size_t workspaceSize); size_t workspaceSize);
@ -646,7 +647,7 @@ size_t ZSTD_CStreamOutSize(void);
* Streaming decompression - HowTo * Streaming decompression - HowTo
* *
* A ZSTD_DStream object is required to track streaming operations. * A ZSTD_DStream object is required to track streaming operations.
* Use ZSTD_createDStream() to initialize a ZSTD_DStream object. * Use ZSTD_initDStream() to initialize a ZSTD_DStream object.
* ZSTD_DStream objects can be re-used multiple times. * ZSTD_DStream objects can be re-used multiple times.
* *
* Use ZSTD_decompressStream() repetitively to consume your input. * Use ZSTD_decompressStream() repetitively to consume your input.
@ -660,11 +661,11 @@ size_t ZSTD_CStreamOutSize(void);
******************************************************************************/ ******************************************************************************/
/** /**
* ZSTD_DStreamWorkspaceBound() - memory needed to create a ZSTD_DStream * ZSTD_DStreamWorkspaceBound() - memory needed to initialize a ZSTD_DStream
* @maxWindowSize: The maximum window size allowed for compressed frames. * @maxWindowSize: The maximum window size allowed for compressed frames.
* *
* Return: A lower bound on the size of the workspace that is passed to * Return: A lower bound on the size of the workspace that is passed to
* ZSTD_createDStream() and ZSTD_createDStream_usingDDict(). * ZSTD_initDStream() and ZSTD_initDStream_usingDDict().
*/ */
size_t ZSTD_DStreamWorkspaceBound(size_t maxWindowSize); size_t ZSTD_DStreamWorkspaceBound(size_t maxWindowSize);
@ -674,7 +675,7 @@ size_t ZSTD_DStreamWorkspaceBound(size_t maxWindowSize);
typedef struct ZSTD_DStream_s ZSTD_DStream; typedef struct ZSTD_DStream_s ZSTD_DStream;
/*===== ZSTD_DStream management functions =====*/ /*===== ZSTD_DStream management functions =====*/
/** /**
* ZSTD_createDStream() - create a zstd streaming decompression context * ZSTD_initDStream() - initialize a zstd streaming decompression context
* @maxWindowSize: The maximum window size allowed for compressed frames. * @maxWindowSize: The maximum window size allowed for compressed frames.
* @workspace: The workspace to emplace the context into. It must outlive * @workspace: The workspace to emplace the context into. It must outlive
* the returned context. * the returned context.
@ -684,10 +685,10 @@ typedef struct ZSTD_DStream_s ZSTD_DStream;
* *
* Return: The zstd streaming decompression context. * Return: The zstd streaming decompression context.
*/ */
ZSTD_DStream *ZSTD_createDStream(size_t maxWindowSize, void *workspace, ZSTD_DStream *ZSTD_initDStream(size_t maxWindowSize, void *workspace,
size_t workspaceSize); size_t workspaceSize);
/** /**
* ZSTD_createDStream_usingDDict() - create zstd streaming decompression context * ZSTD_initDStream_usingDDict() - initialize streaming decompression context
* @maxWindowSize: The maximum window size allowed for compressed frames. * @maxWindowSize: The maximum window size allowed for compressed frames.
* @ddict: The digested dictionary to use for decompression. * @ddict: The digested dictionary to use for decompression.
* @workspace: The workspace to emplace the context into. It must outlive * @workspace: The workspace to emplace the context into. It must outlive
@ -698,7 +699,7 @@ ZSTD_DStream *ZSTD_createDStream(size_t maxWindowSize, void *workspace,
* *
* Return: The zstd streaming decompression context. * Return: The zstd streaming decompression context.
*/ */
ZSTD_DStream *ZSTD_createDStream_usingDDict(size_t maxWindowSize, ZSTD_DStream *ZSTD_initDStream_usingDDict(size_t maxWindowSize,
const ZSTD_DDict *ddict, void *workspace, size_t workspaceSize); const ZSTD_DDict *ddict, void *workspace, size_t workspaceSize);
/*===== Streaming decompression functions =====*/ /*===== Streaming decompression functions =====*/
@ -953,7 +954,7 @@ size_t ZSTD_getFrameParams(ZSTD_frameParams *fparamsPtr, const void *src,
* Buffer-less streaming compression (synchronous mode) * Buffer-less streaming compression (synchronous mode)
* *
* A ZSTD_CCtx object is required to track streaming operations. * A ZSTD_CCtx object is required to track streaming operations.
* Use ZSTD_createCCtx() to create a context. * Use ZSTD_initCCtx() to initialize a context.
* ZSTD_CCtx object can be re-used multiple times within successive compression * ZSTD_CCtx object can be re-used multiple times within successive compression
* operations. * operations.
* *
@ -1015,7 +1016,7 @@ size_t ZSTD_compressEnd(ZSTD_CCtx *cctx, void *dst, size_t dstCapacity,
* Buffer-less streaming decompression (synchronous mode) * Buffer-less streaming decompression (synchronous mode)
* *
* A ZSTD_DCtx object is required to track streaming operations. * A ZSTD_DCtx object is required to track streaming operations.
* Use ZSTD_createDCtx() to create a context. * Use ZSTD_initDCtx() to initialize a context.
* A ZSTD_DCtx object can be re-used multiple times. * A ZSTD_DCtx object can be re-used multiple times.
* *
* First typical operation is to retrieve frame parameters, using * First typical operation is to retrieve frame parameters, using
@ -1116,7 +1117,7 @@ ZSTD_nextInputType_e ZSTD_nextInputType(ZSTD_DCtx *dctx);
* *
* A few rules to respect: * A few rules to respect:
* - Compressing and decompressing require a context structure * - Compressing and decompressing require a context structure
* + Use ZSTD_createCCtx() and ZSTD_createDCtx() * + Use ZSTD_initCCtx() and ZSTD_initDCtx()
* - It is necessary to init context before starting * - It is necessary to init context before starting
* + compression : ZSTD_compressBegin() * + compression : ZSTD_compressBegin()
* + decompression : ZSTD_decompressBegin() * + decompression : ZSTD_decompressBegin()

18
contrib/linux-kernel/lib/zstd/compress.c
View File

@ -116,7 +116,7 @@ static ZSTD_CCtx* ZSTD_createCCtx_advanced(ZSTD_customMem customMem)
return cctx; return cctx;
} }
ZSTD_CCtx* ZSTD_createCCtx(void* workspace, size_t workspaceSize) ZSTD_CCtx* ZSTD_initCCtx(void* workspace, size_t workspaceSize)
{ {
ZSTD_customMem const stackMem = ZSTD_initStack(workspace, workspaceSize); ZSTD_customMem const stackMem = ZSTD_initStack(workspace, workspaceSize);
ZSTD_CCtx* cctx = ZSTD_createCCtx_advanced(stackMem); ZSTD_CCtx* cctx = ZSTD_createCCtx_advanced(stackMem);
@ -2819,7 +2819,7 @@ static ZSTD_CDict* ZSTD_createCDict_advanced(const void* dictBuffer, size_t dict
} }
} }
ZSTD_CDict* ZSTD_createCDict(const void* dict, size_t dictSize, ZSTD_parameters params, void* workspace, size_t workspaceSize) ZSTD_CDict* ZSTD_initCDict(const void* dict, size_t dictSize, ZSTD_parameters params, void* workspace, size_t workspaceSize)
{ {
ZSTD_customMem const stackMem = ZSTD_initStack(workspace, workspaceSize); ZSTD_customMem const stackMem = ZSTD_initStack(workspace, workspaceSize);
return ZSTD_createCDict_advanced(dict, dictSize, 1, params, stackMem); return ZSTD_createCDict_advanced(dict, dictSize, 1, params, stackMem);
@ -3010,7 +3010,7 @@ static size_t ZSTD_initCStream_advanced(ZSTD_CStream* zcs,
return ZSTD_resetCStream_internal(zcs, pledgedSrcSize); return ZSTD_resetCStream_internal(zcs, pledgedSrcSize);
} }
ZSTD_CStream* ZSTD_createCStream(ZSTD_parameters params, unsigned long long pledgedSrcSize, void* workspace, size_t workspaceSize) ZSTD_CStream* ZSTD_initCStream(ZSTD_parameters params, unsigned long long pledgedSrcSize, void* workspace, size_t workspaceSize)
{ {
ZSTD_customMem const stackMem = ZSTD_initStack(workspace, workspaceSize); ZSTD_customMem const stackMem = ZSTD_initStack(workspace, workspaceSize);
ZSTD_CStream* const zcs = ZSTD_createCStream_advanced(stackMem); ZSTD_CStream* const zcs = ZSTD_createCStream_advanced(stackMem);
@ -3021,10 +3021,10 @@ ZSTD_CStream* ZSTD_createCStream(ZSTD_parameters params, unsigned long long pled
return zcs; return zcs;
} }
ZSTD_CStream* ZSTD_createCStream_usingCDict(const ZSTD_CDict* cdict, unsigned long long pledgedSrcSize, void* workspace, size_t workspaceSize) ZSTD_CStream* ZSTD_initCStream_usingCDict(const ZSTD_CDict* cdict, unsigned long long pledgedSrcSize, void* workspace, size_t workspaceSize)
{ {
ZSTD_parameters const params = ZSTD_getParamsFromCDict(cdict); ZSTD_parameters const params = ZSTD_getParamsFromCDict(cdict);
ZSTD_CStream* const zcs = ZSTD_createCStream(params, pledgedSrcSize, workspace, workspaceSize); ZSTD_CStream* const zcs = ZSTD_initCStream(params, pledgedSrcSize, workspace, workspaceSize);
if (zcs) { if (zcs) {
zcs->cdict = cdict; zcs->cdict = cdict;
if (ZSTD_isError(ZSTD_resetCStream_internal(zcs, pledgedSrcSize))) { if (ZSTD_isError(ZSTD_resetCStream_internal(zcs, pledgedSrcSize))) {
@ -3346,17 +3346,17 @@ EXPORT_SYMBOL(ZSTD_maxCLevel);
EXPORT_SYMBOL(ZSTD_compressBound); EXPORT_SYMBOL(ZSTD_compressBound);
EXPORT_SYMBOL(ZSTD_CCtxWorkspaceBound); EXPORT_SYMBOL(ZSTD_CCtxWorkspaceBound);
EXPORT_SYMBOL(ZSTD_createCCtx); EXPORT_SYMBOL(ZSTD_initCCtx);
EXPORT_SYMBOL(ZSTD_compressCCtx); EXPORT_SYMBOL(ZSTD_compressCCtx);
EXPORT_SYMBOL(ZSTD_compress_usingDict); EXPORT_SYMBOL(ZSTD_compress_usingDict);
EXPORT_SYMBOL(ZSTD_CDictWorkspaceBound); EXPORT_SYMBOL(ZSTD_CDictWorkspaceBound);
EXPORT_SYMBOL(ZSTD_createCDict); EXPORT_SYMBOL(ZSTD_initCDict);
EXPORT_SYMBOL(ZSTD_compress_usingCDict); EXPORT_SYMBOL(ZSTD_compress_usingCDict);
EXPORT_SYMBOL(ZSTD_CStreamWorkspaceBound); EXPORT_SYMBOL(ZSTD_CStreamWorkspaceBound);
EXPORT_SYMBOL(ZSTD_createCStream); EXPORT_SYMBOL(ZSTD_initCStream);
EXPORT_SYMBOL(ZSTD_createCStream_usingCDict); EXPORT_SYMBOL(ZSTD_initCStream_usingCDict);
EXPORT_SYMBOL(ZSTD_resetCStream); EXPORT_SYMBOL(ZSTD_resetCStream);
EXPORT_SYMBOL(ZSTD_compressStream); EXPORT_SYMBOL(ZSTD_compressStream);
EXPORT_SYMBOL(ZSTD_flushStream); EXPORT_SYMBOL(ZSTD_flushStream);

20
contrib/linux-kernel/lib/zstd/decompress.c
View File

@ -130,7 +130,7 @@ ZSTD_DCtx* ZSTD_createDCtx_advanced(ZSTD_customMem customMem)
return dctx; return dctx;
} }
ZSTD_DCtx* ZSTD_createDCtx(void* workspace, size_t workspaceSize) ZSTD_DCtx* ZSTD_initDCtx(void* workspace, size_t workspaceSize)
{ {
ZSTD_customMem const stackMem = ZSTD_initStack(workspace, workspaceSize); ZSTD_customMem const stackMem = ZSTD_initStack(workspace, workspaceSize);
return ZSTD_createDCtx_advanced(stackMem); return ZSTD_createDCtx_advanced(stackMem);
@ -1968,11 +1968,11 @@ static ZSTD_DDict* ZSTD_createDDict_advanced(const void* dict, size_t dictSize,
} }
} }
/*! ZSTD_createDDict() : /*! ZSTD_initDDict() :
* Create a digested dictionary, to start decompression without startup delay. * Create a digested dictionary, to start decompression without startup delay.
* `dict` content is copied inside DDict. * `dict` content is copied inside DDict.
* Consequently, `dict` can be released after `ZSTD_DDict` creation */ * Consequently, `dict` can be released after `ZSTD_DDict` creation */
ZSTD_DDict* ZSTD_createDDict(const void* dict, size_t dictSize, void* workspace, size_t workspaceSize) ZSTD_DDict* ZSTD_initDDict(const void* dict, size_t dictSize, void* workspace, size_t workspaceSize)
{ {
ZSTD_customMem const stackMem = ZSTD_initStack(workspace, workspaceSize); ZSTD_customMem const stackMem = ZSTD_initStack(workspace, workspaceSize);
return ZSTD_createDDict_advanced(dict, dictSize, 1, stackMem); return ZSTD_createDDict_advanced(dict, dictSize, 1, stackMem);
@ -2100,7 +2100,7 @@ static ZSTD_DStream* ZSTD_createDStream_advanced(ZSTD_customMem customMem)
return zds; return zds;
} }
ZSTD_DStream* ZSTD_createDStream(size_t maxWindowSize, void* workspace, size_t workspaceSize) ZSTD_DStream* ZSTD_initDStream(size_t maxWindowSize, void* workspace, size_t workspaceSize)
{ {
ZSTD_customMem const stackMem = ZSTD_initStack(workspace, workspaceSize); ZSTD_customMem const stackMem = ZSTD_initStack(workspace, workspaceSize);
ZSTD_DStream* zds = ZSTD_createDStream_advanced(stackMem); ZSTD_DStream* zds = ZSTD_createDStream_advanced(stackMem);
@ -2117,9 +2117,9 @@ ZSTD_DStream* ZSTD_createDStream(size_t maxWindowSize, void* workspace, size_t w
return zds; return zds;
} }
ZSTD_DStream* ZSTD_createDStream_usingDDict(size_t maxWindowSize, const ZSTD_DDict* ddict, void* workspace, size_t workspaceSize) ZSTD_DStream* ZSTD_initDStream_usingDDict(size_t maxWindowSize, const ZSTD_DDict* ddict, void* workspace, size_t workspaceSize)
{ {
ZSTD_DStream* zds = ZSTD_createDStream(maxWindowSize, workspace, workspaceSize); ZSTD_DStream* zds = ZSTD_initDStream(maxWindowSize, workspace, workspaceSize);
if (zds) { if (zds) {
zds->ddict = ddict; zds->ddict = ddict;
} }
@ -2337,17 +2337,17 @@ size_t ZSTD_decompressStream(ZSTD_DStream* zds, ZSTD_outBuffer* output, ZSTD_inB
} }
EXPORT_SYMBOL(ZSTD_DCtxWorkspaceBound); EXPORT_SYMBOL(ZSTD_DCtxWorkspaceBound);
EXPORT_SYMBOL(ZSTD_createDCtx); EXPORT_SYMBOL(ZSTD_initDCtx);
EXPORT_SYMBOL(ZSTD_decompressDCtx); EXPORT_SYMBOL(ZSTD_decompressDCtx);
EXPORT_SYMBOL(ZSTD_decompress_usingDict); EXPORT_SYMBOL(ZSTD_decompress_usingDict);
EXPORT_SYMBOL(ZSTD_DDictWorkspaceBound); EXPORT_SYMBOL(ZSTD_DDictWorkspaceBound);
EXPORT_SYMBOL(ZSTD_createDDict); EXPORT_SYMBOL(ZSTD_initDDict);
EXPORT_SYMBOL(ZSTD_decompress_usingDDict); EXPORT_SYMBOL(ZSTD_decompress_usingDDict);
EXPORT_SYMBOL(ZSTD_DStreamWorkspaceBound); EXPORT_SYMBOL(ZSTD_DStreamWorkspaceBound);
EXPORT_SYMBOL(ZSTD_createDStream); EXPORT_SYMBOL(ZSTD_initDStream);
EXPORT_SYMBOL(ZSTD_createDStream_usingDDict); EXPORT_SYMBOL(ZSTD_initDStream_usingDDict);
EXPORT_SYMBOL(ZSTD_resetDStream); EXPORT_SYMBOL(ZSTD_resetDStream);
EXPORT_SYMBOL(ZSTD_decompressStream); EXPORT_SYMBOL(ZSTD_decompressStream);
EXPORT_SYMBOL(ZSTD_DStreamInSize); EXPORT_SYMBOL(ZSTD_DStreamInSize);

40
contrib/linux-kernel/test/UserlandTest.cpp
View File

@ -20,7 +20,7 @@ createCCtx(ZSTD_compressionParameters cParams) {
size_t const workspaceSize = ZSTD_CCtxWorkspaceBound(cParams); size_t const workspaceSize = ZSTD_CCtxWorkspaceBound(cParams);
void *workspace = malloc(workspaceSize); void *workspace = malloc(workspaceSize);
std::unique_ptr<ZSTD_CCtx, WorkspaceDeleter> cctx{ std::unique_ptr<ZSTD_CCtx, WorkspaceDeleter> cctx{
ZSTD_createCCtx(workspace, workspaceSize), WorkspaceDeleter{workspace}}; ZSTD_initCCtx(workspace, workspaceSize), WorkspaceDeleter{workspace}};
if (!cctx) { if (!cctx) {
throw std::runtime_error{"Bad cctx"}; throw std::runtime_error{"Bad cctx"};
} }
@ -39,7 +39,7 @@ createDCtx() {
size_t const workspaceSize = ZSTD_DCtxWorkspaceBound(); size_t const workspaceSize = ZSTD_DCtxWorkspaceBound();
void *workspace = malloc(workspaceSize); void *workspace = malloc(workspaceSize);
std::unique_ptr<ZSTD_DCtx, WorkspaceDeleter> dctx{ std::unique_ptr<ZSTD_DCtx, WorkspaceDeleter> dctx{
ZSTD_createDCtx(workspace, workspaceSize), WorkspaceDeleter{workspace}}; ZSTD_initDCtx(workspace, workspaceSize), WorkspaceDeleter{workspace}};
if (!dctx) { if (!dctx) {
throw std::runtime_error{"Bad dctx"}; throw std::runtime_error{"Bad dctx"};
} }
@ -51,7 +51,7 @@ createCDict(std::string const& dict, ZSTD_parameters params) {
size_t const workspaceSize = ZSTD_CDictWorkspaceBound(params.cParams); size_t const workspaceSize = ZSTD_CDictWorkspaceBound(params.cParams);
void *workspace = malloc(workspaceSize); void *workspace = malloc(workspaceSize);
std::unique_ptr<ZSTD_CDict, WorkspaceDeleter> cdict{ std::unique_ptr<ZSTD_CDict, WorkspaceDeleter> cdict{
ZSTD_createCDict(dict.data(), dict.size(), params, workspace, ZSTD_initCDict(dict.data(), dict.size(), params, workspace,
workspaceSize), workspaceSize),
WorkspaceDeleter{workspace}}; WorkspaceDeleter{workspace}};
if (!cdict) { if (!cdict) {
@ -71,7 +71,7 @@ createDDict(std::string const& dict) {
size_t const workspaceSize = ZSTD_DDictWorkspaceBound(); size_t const workspaceSize = ZSTD_DDictWorkspaceBound();
void *workspace = malloc(workspaceSize); void *workspace = malloc(workspaceSize);
std::unique_ptr<ZSTD_DDict, WorkspaceDeleter> ddict{ std::unique_ptr<ZSTD_DDict, WorkspaceDeleter> ddict{
ZSTD_createDDict(dict.data(), dict.size(), workspace, workspaceSize), ZSTD_initDDict(dict.data(), dict.size(), workspace, workspaceSize),
WorkspaceDeleter{workspace}}; WorkspaceDeleter{workspace}};
if (!ddict) { if (!ddict) {
throw std::runtime_error{"Bad ddict"}; throw std::runtime_error{"Bad ddict"};
@ -84,7 +84,7 @@ createCStream(ZSTD_parameters params, unsigned long long pledgedSrcSize = 0) {
size_t const workspaceSize = ZSTD_CStreamWorkspaceBound(params.cParams); size_t const workspaceSize = ZSTD_CStreamWorkspaceBound(params.cParams);
void *workspace = malloc(workspaceSize); void *workspace = malloc(workspaceSize);
std::unique_ptr<ZSTD_CStream, WorkspaceDeleter> zcs{ std::unique_ptr<ZSTD_CStream, WorkspaceDeleter> zcs{
ZSTD_createCStream(params, pledgedSrcSize, workspace, workspaceSize)}; ZSTD_initCStream(params, pledgedSrcSize, workspace, workspaceSize)};
if (!zcs) { if (!zcs) {
throw std::runtime_error{"bad cstream"}; throw std::runtime_error{"bad cstream"};
} }
@ -97,7 +97,7 @@ createCStream(ZSTD_compressionParameters cParams, ZSTD_CDict const &cdict,
size_t const workspaceSize = ZSTD_CStreamWorkspaceBound(cParams); size_t const workspaceSize = ZSTD_CStreamWorkspaceBound(cParams);
void *workspace = malloc(workspaceSize); void *workspace = malloc(workspaceSize);
std::unique_ptr<ZSTD_CStream, WorkspaceDeleter> zcs{ std::unique_ptr<ZSTD_CStream, WorkspaceDeleter> zcs{
ZSTD_createCStream_usingCDict(&cdict, pledgedSrcSize, workspace, ZSTD_initCStream_usingCDict(&cdict, pledgedSrcSize, workspace,
workspaceSize)}; workspaceSize)};
if (!zcs) { if (!zcs) {
throw std::runtime_error{"bad cstream"}; throw std::runtime_error{"bad cstream"};
@ -118,8 +118,8 @@ createDStream(size_t maxWindowSize = (1ULL << ZSTD_WINDOWLOG_MAX),
void *workspace = malloc(workspaceSize); void *workspace = malloc(workspaceSize);
std::unique_ptr<ZSTD_DStream, WorkspaceDeleter> zds{ std::unique_ptr<ZSTD_DStream, WorkspaceDeleter> zds{
ddict == nullptr ddict == nullptr
? ZSTD_createDStream(maxWindowSize, workspace, workspaceSize) ? ZSTD_initDStream(maxWindowSize, workspace, workspaceSize)
: ZSTD_createDStream_usingDDict(maxWindowSize, ddict, workspace, : ZSTD_initDStream_usingDDict(maxWindowSize, ddict, workspace,
workspaceSize)}; workspaceSize)};
if (!zds) { if (!zds) {
throw std::runtime_error{"bad dstream"}; throw std::runtime_error{"bad dstream"};
@ -333,7 +333,7 @@ TEST(Block, PreprocessedZstdDict) {
EXPECT_EQ(kData, decompressed); EXPECT_EQ(kData, decompressed);
} }
TEST(Block, RecreateCCtx) { TEST(Block, ReinitializeCCtx) {
auto cctx = createCCtx(1); auto cctx = createCCtx(1);
{ {
auto const compressed = compress(*cctx, kData, 1); auto const compressed = compress(*cctx, kData, 1);
@ -346,7 +346,7 @@ TEST(Block, RecreateCCtx) {
auto raw = cctx.release(); auto raw = cctx.release();
auto params = ZSTD_getParams(1, 0, 0); auto params = ZSTD_getParams(1, 0, 0);
cctx.reset( cctx.reset(
ZSTD_createCCtx(d.memory, ZSTD_CCtxWorkspaceBound(params.cParams))); ZSTD_initCCtx(d.memory, ZSTD_CCtxWorkspaceBound(params.cParams)));
// Repeat // Repeat
{ {
auto const compressed = compress(*cctx, kData, 1); auto const compressed = compress(*cctx, kData, 1);
@ -356,7 +356,7 @@ TEST(Block, RecreateCCtx) {
} }
} }
TEST(Block, RecreateDCtx) { TEST(Block, ReinitializeDCtx) {
auto dctx = createDCtx(); auto dctx = createDCtx();
{ {
auto cctx = createCCtx(1); auto cctx = createCCtx(1);
@ -367,7 +367,7 @@ TEST(Block, RecreateDCtx) {
// Create the cctx with the same memory // Create the cctx with the same memory
auto d = dctx.get_deleter(); auto d = dctx.get_deleter();
auto raw = dctx.release(); auto raw = dctx.release();
dctx.reset(ZSTD_createDCtx(d.memory, ZSTD_DCtxWorkspaceBound())); dctx.reset(ZSTD_initDCtx(d.memory, ZSTD_DCtxWorkspaceBound()));
// Repeat // Repeat
{ {
auto cctx = createCCtx(1); auto cctx = createCCtx(1);
@ -486,24 +486,24 @@ TEST(Stream, Flush) {
TEST(API, Symbols) { TEST(API, Symbols) {
TEST_SYMBOL(ZSTD_CCtxWorkspaceBound); TEST_SYMBOL(ZSTD_CCtxWorkspaceBound);
TEST_SYMBOL(ZSTD_createCCtx); TEST_SYMBOL(ZSTD_initCCtx);
TEST_SYMBOL(ZSTD_compressCCtx); TEST_SYMBOL(ZSTD_compressCCtx);
TEST_SYMBOL(ZSTD_compress_usingDict); TEST_SYMBOL(ZSTD_compress_usingDict);
TEST_SYMBOL(ZSTD_DCtxWorkspaceBound); TEST_SYMBOL(ZSTD_DCtxWorkspaceBound);
TEST_SYMBOL(ZSTD_createDCtx); TEST_SYMBOL(ZSTD_initDCtx);
TEST_SYMBOL(ZSTD_decompressDCtx); TEST_SYMBOL(ZSTD_decompressDCtx);
TEST_SYMBOL(ZSTD_decompress_usingDict); TEST_SYMBOL(ZSTD_decompress_usingDict);
TEST_SYMBOL(ZSTD_CDictWorkspaceBound); TEST_SYMBOL(ZSTD_CDictWorkspaceBound);
TEST_SYMBOL(ZSTD_createCDict); TEST_SYMBOL(ZSTD_initCDict);
TEST_SYMBOL(ZSTD_compress_usingCDict); TEST_SYMBOL(ZSTD_compress_usingCDict);
TEST_SYMBOL(ZSTD_DDictWorkspaceBound); TEST_SYMBOL(ZSTD_DDictWorkspaceBound);
TEST_SYMBOL(ZSTD_createDDict); TEST_SYMBOL(ZSTD_initDDict);
TEST_SYMBOL(ZSTD_decompress_usingDDict); TEST_SYMBOL(ZSTD_decompress_usingDDict);
TEST_SYMBOL(ZSTD_CStreamWorkspaceBound); TEST_SYMBOL(ZSTD_CStreamWorkspaceBound);
TEST_SYMBOL(ZSTD_createCStream); TEST_SYMBOL(ZSTD_initCStream);
TEST_SYMBOL(ZSTD_createCStream_usingCDict); TEST_SYMBOL(ZSTD_initCStream_usingCDict);
TEST_SYMBOL(ZSTD_resetCStream); TEST_SYMBOL(ZSTD_resetCStream);
TEST_SYMBOL(ZSTD_compressStream); TEST_SYMBOL(ZSTD_compressStream);
TEST_SYMBOL(ZSTD_flushStream); TEST_SYMBOL(ZSTD_flushStream);
@ -511,8 +511,8 @@ TEST(API, Symbols) {
TEST_SYMBOL(ZSTD_CStreamInSize); TEST_SYMBOL(ZSTD_CStreamInSize);
TEST_SYMBOL(ZSTD_CStreamOutSize); TEST_SYMBOL(ZSTD_CStreamOutSize);
TEST_SYMBOL(ZSTD_DStreamWorkspaceBound); TEST_SYMBOL(ZSTD_DStreamWorkspaceBound);
TEST_SYMBOL(ZSTD_createDStream); TEST_SYMBOL(ZSTD_initDStream);
TEST_SYMBOL(ZSTD_createDStream_usingDDict); TEST_SYMBOL(ZSTD_initDStream_usingDDict);
TEST_SYMBOL(ZSTD_resetDStream); TEST_SYMBOL(ZSTD_resetDStream);
TEST_SYMBOL(ZSTD_decompressStream); TEST_SYMBOL(ZSTD_decompressStream);
TEST_SYMBOL(ZSTD_DStreamInSize); TEST_SYMBOL(ZSTD_DStreamInSize);