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

feat(compress): move CDict begin policy into Rust

Browse Source 
Move the legacy ZSTD_compressBegin_usingCDict fixed frame policy and unknown
source pledge behind a Rust-owned boundary. Keep the private CDict begin
operation in C behind an explicit callback and preserve the parameterized
advanced API in C.

Test Plan:
- ulimit -v 41943040; CARGO_BUILD_JOBS=1 cargo test --manifest-path rust/Cargo.toml --release compress_begin_using_cdict_public -- --nocapture
- ulimit -v 41943040; CARGO_BUILD_JOBS=1 cargo test --manifest-path rust/Cargo.toml --release
- ulimit -v 41943040; CARGO_BUILD_JOBS=1 cargo clippy --manifest-path rust/Cargo.toml --release --all-targets -- -D warnings
- ulimit -v 41943040; make -B -C programs -j1 zstd
- ulimit -v 41943040; make -C tests -j1 test-zstream ZSTREAM_TESTTIME=-T1s
This commit is contained in:
ddidderr
2026-07-19 16:02:50 +02:00
parent fe136f2128
commit 2fdd548a36
2 changed files with 133 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/compress/zstd_compress.c
+32 -2
View File
@@ -1392,6 +1392,24 @@ typedef char ZSTD_rust_compress_using_cdict_state_layout[
== 3 * sizeof(void*)
&& sizeof(ZSTD_rust_compressUsingCDictState) == 4 * sizeof(void*))
? 1 : -1];
typedef size_t (*ZSTD_rust_compressBeginUsingCDictPublicBegin_f)(
void* context, const void* cdict,
const ZSTD_frameParameters* fParams, U64 pledgedSrcSize);
typedef struct {
void* callbackContext;
const void* cdict;
ZSTD_rust_compressBeginUsingCDictPublicBegin_f begin;
} ZSTD_rust_compressBeginUsingCDictPublicState;
size_t ZSTD_rust_compressBeginUsingCDictPublic(
const ZSTD_rust_compressBeginUsingCDictPublicState* state);
typedef char ZSTD_rust_compress_begin_using_cdict_public_state_layout[
(offsetof(ZSTD_rust_compressBeginUsingCDictPublicState, callbackContext) == 0
&& offsetof(ZSTD_rust_compressBeginUsingCDictPublicState, cdict)
== sizeof(void*)
&& offsetof(ZSTD_rust_compressBeginUsingCDictPublicState, begin)
== 2 * sizeof(void*)
&& sizeof(ZSTD_rust_compressBeginUsingCDictPublicState) == 3 * sizeof(void*))
? 1 : -1];
typedef void (*ZSTD_rust_compressBeginUsingDictInitParams_f)(
void* cctxParams, const ZSTD_parameters* params, int compressionLevel);
typedef size_t (*ZSTD_rust_compressBeginUsingDictBegin_f)(
@@ -5591,6 +5609,15 @@ static size_t ZSTD_compressBegin_usingCDict_internal(
return ZSTD_rust_compressBeginUsingCDict(&state);
}
static size_t ZSTD_rust_compressBeginUsingCDictPublic_begin(
void* context, const void* cdict,
const ZSTD_frameParameters* fParams, U64 pledgedSrcSize)
{
return ZSTD_compressBegin_usingCDict_internal(
(ZSTD_CCtx*)context, (const ZSTD_CDict*)cdict,
*fParams, pledgedSrcSize);
}
/* ZSTD_compressBegin_usingCDict_advanced() :
* This function is DEPRECATED.
@@ -5606,8 +5633,11 @@ size_t ZSTD_compressBegin_usingCDict_advanced(
* cdict must be != NULL */
size_t ZSTD_compressBegin_usingCDict_deprecated(ZSTD_CCtx* cctx, const ZSTD_CDict* cdict)
{
ZSTD_frameParameters const fParams = { 0 /*content*/, 0 /*checksum*/, 0 /*noDictID*/ };
return ZSTD_compressBegin_usingCDict_internal(cctx, cdict, fParams, ZSTD_CONTENTSIZE_UNKNOWN);
ZSTD_rust_compressBeginUsingCDictPublicState state;
state.callbackContext = cctx;
state.cdict = cdict;
state.begin = ZSTD_rust_compressBeginUsingCDictPublic_begin;
return ZSTD_rust_compressBeginUsingCDictPublic(&state);
}
size_t ZSTD_compressBegin_usingCDict(ZSTD_CCtx* cctx, const ZSTD_CDict* cdict)