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

feat(compress): move cdict stream init policy into Rust

Browse Source 
Move ZSTD_initCStream_usingCDict_advanced's reset, pledge, frame-parameter,
and CDict callback ordering into the Rust projection. Keep private CCtx and
CDict mutations in C callbacks and pass frame parameters as scalars across the
ABI boundary.

Test Plan:
- ulimit -v 41943040; CARGO_BUILD_JOBS=1 cargo test --manifest-path rust/Cargo.toml init_cstream_using_cdict_advanced -- --test-threads=1
- ulimit -v 41943040; make -B -C programs -j1 zstd
- git diff --cached --check
This commit is contained in:
ddidderr
2026-07-19 11:58:35 +02:00
parent fe6cf3bccc
commit b0c03f41f5
2 changed files with 288 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/compress/zstd_compress.c
+67 -5
View File
@@ -68,6 +68,37 @@ typedef char ZSTD_rust_reset_cstream_state_layout[
== 2 * sizeof(void*)
&& sizeof(ZSTD_rust_resetCStreamState) == 3 * sizeof(void*))
? 1 : -1];
typedef size_t (*ZSTD_rust_initCStreamUsingCDictAdvancedReset_f)(void* context);
typedef size_t (*ZSTD_rust_initCStreamUsingCDictAdvancedSetPledgedSrcSize_f)(
void* context, unsigned long long pledgedSrcSize);
typedef void (*ZSTD_rust_initCStreamUsingCDictAdvancedSetFrameParams_f)(
void* context, unsigned contentSizeFlag, unsigned checksumFlag,
unsigned noDictIDFlag);
typedef size_t (*ZSTD_rust_initCStreamUsingCDictAdvancedRefCDict_f)(
void* context, const void* cdict);
typedef struct {
void* callbackContext;
ZSTD_rust_initCStreamUsingCDictAdvancedReset_f resetSession;
ZSTD_rust_initCStreamUsingCDictAdvancedSetPledgedSrcSize_f setPledgedSrcSize;
ZSTD_rust_initCStreamUsingCDictAdvancedSetFrameParams_f setFrameParams;
ZSTD_rust_initCStreamUsingCDictAdvancedRefCDict_f refCDict;
} ZSTD_rust_initCStreamUsingCDictAdvancedState;
size_t ZSTD_rust_initCStreamUsingCDictAdvanced(
const ZSTD_rust_initCStreamUsingCDictAdvancedState* state,
unsigned long long pledgedSrcSize, unsigned contentSizeFlag,
unsigned checksumFlag, unsigned noDictIDFlag, const void* cdict);
typedef char ZSTD_rust_init_cstream_using_cdict_advanced_state_layout[
(offsetof(ZSTD_rust_initCStreamUsingCDictAdvancedState, callbackContext) == 0
&& offsetof(ZSTD_rust_initCStreamUsingCDictAdvancedState, resetSession)
== sizeof(void*)
&& offsetof(ZSTD_rust_initCStreamUsingCDictAdvancedState, setPledgedSrcSize)
== 2 * sizeof(void*)
&& offsetof(ZSTD_rust_initCStreamUsingCDictAdvancedState, setFrameParams)
== 3 * sizeof(void*)
&& offsetof(ZSTD_rust_initCStreamUsingCDictAdvancedState, refCDict)
== 4 * sizeof(void*)
&& sizeof(ZSTD_rust_initCStreamUsingCDictAdvancedState) == 5 * sizeof(void*))
? 1 : -1];
ZSTD_frameProgression ZSTD_rust_frameProgression(U64 consumedSrcSize,
size_t buffered,
U64 producedCSize);
@@ -4833,17 +4864,48 @@ size_t ZSTD_initCStream_internal(ZSTD_CStream* zcs,
/* ZSTD_initCStream_usingCDict_advanced() :
* same as ZSTD_initCStream_usingCDict(), with control over frame parameters */
static size_t ZSTD_rust_initCStreamUsingCDictAdvanced_resetSession(void* context)
{
return ZSTD_CCtx_reset((ZSTD_CCtx*)context, ZSTD_reset_session_only);
}
static size_t ZSTD_rust_initCStreamUsingCDictAdvanced_setPledgedSrcSize(
void* context, unsigned long long pledgedSrcSize)
{
return ZSTD_CCtx_setPledgedSrcSize((ZSTD_CCtx*)context, pledgedSrcSize);
}
static void ZSTD_rust_initCStreamUsingCDictAdvanced_setFrameParams(
void* context, unsigned contentSizeFlag, unsigned checksumFlag,
unsigned noDictIDFlag)
{
ZSTD_CCtx* const zcs = (ZSTD_CCtx*)context;
zcs->requestedParams.fParams.contentSizeFlag = contentSizeFlag;
zcs->requestedParams.fParams.checksumFlag = checksumFlag;
zcs->requestedParams.fParams.noDictIDFlag = noDictIDFlag;
}
static size_t ZSTD_rust_initCStreamUsingCDictAdvanced_refCDict(
void* context, const void* cdict)
{
return ZSTD_CCtx_refCDict((ZSTD_CCtx*)context, (const ZSTD_CDict*)cdict);
}
size_t ZSTD_initCStream_usingCDict_advanced(ZSTD_CStream* zcs,
const ZSTD_CDict* cdict,
ZSTD_frameParameters fParams,
unsigned long long pledgedSrcSize)
{
ZSTD_rust_initCStreamUsingCDictAdvancedState state;
DEBUGLOG(4, "ZSTD_initCStream_usingCDict_advanced");
FORWARD_IF_ERROR( ZSTD_CCtx_reset(zcs, ZSTD_reset_session_only) , "");
FORWARD_IF_ERROR( ZSTD_CCtx_setPledgedSrcSize(zcs, pledgedSrcSize) , "");
zcs->requestedParams.fParams = fParams;
FORWARD_IF_ERROR( ZSTD_CCtx_refCDict(zcs, cdict) , "");
return 0;
state.callbackContext = zcs;
state.resetSession = ZSTD_rust_initCStreamUsingCDictAdvanced_resetSession;
state.setPledgedSrcSize = ZSTD_rust_initCStreamUsingCDictAdvanced_setPledgedSrcSize;
state.setFrameParams = ZSTD_rust_initCStreamUsingCDictAdvanced_setFrameParams;
state.refCDict = ZSTD_rust_initCStreamUsingCDictAdvanced_refCDict;
return ZSTD_rust_initCStreamUsingCDictAdvanced(
&state, pledgedSrcSize, fParams.contentSizeFlag,
fParams.checksumFlag, fParams.noDictIDFlag, cdict);
}
/* note : cdict must outlive compression session */