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

feat(compress): move advanced CDict compression orchestration into Rust

Browse Source 
Move deprecated advanced CDict one-shot validation and begin-then-end ordering
behind a Rust-owned boundary while preserving the explicit frame policy. Keep
the private CDict begin and end operations in C callbacks.

Test Plan:
- ulimit -v 41943040; CARGO_BUILD_JOBS=1 cargo test --manifest-path rust/Cargo.toml --release compress_using_cdict_advanced -- --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:36:39 +02:00
parent 174d4165e3
commit 8b783e8252
2 changed files with 166 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/compress/zstd_compress.c
+32 -13
View File
@@ -1499,6 +1499,30 @@ typedef char ZSTD_rust_compress_using_cdict_state_layout[
== 3 * sizeof(void*)
&& sizeof(ZSTD_rust_compressUsingCDictState) == 4 * sizeof(void*))
? 1 : -1];
typedef struct {
void* callbackContext;
const void* cdict;
const ZSTD_frameParameters* fParams;
ZSTD_rust_compressUsingCDictBegin_f begin;
ZSTD_rust_compressUsingCDictEnd_f end;
} ZSTD_rust_compressUsingCDictAdvancedState;
size_t ZSTD_rust_compressUsingCDictAdvanced(
const ZSTD_rust_compressUsingCDictAdvancedState* state,
void* dst, size_t dstCapacity,
const void* src, size_t srcSize);
typedef char ZSTD_rust_compress_using_cdict_advanced_state_layout[
(offsetof(ZSTD_rust_compressUsingCDictAdvancedState, callbackContext) == 0
&& offsetof(ZSTD_rust_compressUsingCDictAdvancedState, cdict)
== sizeof(void*)
&& offsetof(ZSTD_rust_compressUsingCDictAdvancedState, fParams)
== 2 * sizeof(void*)
&& offsetof(ZSTD_rust_compressUsingCDictAdvancedState, begin)
== 3 * sizeof(void*)
&& offsetof(ZSTD_rust_compressUsingCDictAdvancedState, end)
== 4 * sizeof(void*)
&& sizeof(ZSTD_rust_compressUsingCDictAdvancedState)
== 5 * sizeof(void*))
? 1 : -1];
typedef size_t (*ZSTD_rust_compressBeginUsingCDictPublicBegin_f)(
void* context, const void* cdict,
const ZSTD_frameParameters* fParams, U64 pledgedSrcSize);
@@ -5851,18 +5875,6 @@ size_t ZSTD_compressBegin_usingCDict(ZSTD_CCtx* cctx, const ZSTD_CDict* cdict)
return ZSTD_compressBegin_usingCDict_deprecated(cctx, cdict);
}
/*! ZSTD_compress_usingCDict_internal():
* Implementation of various ZSTD_compress_usingCDict* functions.
*/
static size_t ZSTD_compress_usingCDict_internal(ZSTD_CCtx* cctx,
void* dst, size_t dstCapacity,
const void* src, size_t srcSize,
const ZSTD_CDict* cdict, ZSTD_frameParameters fParams)
{
FORWARD_IF_ERROR(ZSTD_compressBegin_usingCDict_internal(cctx, cdict, fParams, srcSize), ""); /* will check if cdict != NULL */
return ZSTD_compressEnd_public(cctx, dst, dstCapacity, src, srcSize);
}
static size_t ZSTD_rust_compressUsingCDict_begin(
void* context, const void* cdict,
const ZSTD_frameParameters* fParams, U64 pledgedSrcSize)
@@ -5888,7 +5900,14 @@ size_t ZSTD_compress_usingCDict_advanced(ZSTD_CCtx* cctx,
const void* src, size_t srcSize,
const ZSTD_CDict* cdict, ZSTD_frameParameters fParams)
{
return ZSTD_compress_usingCDict_internal(cctx, dst, dstCapacity, src, srcSize, cdict, fParams);
ZSTD_rust_compressUsingCDictAdvancedState state;
state.callbackContext = cctx;
state.cdict = cdict;
state.fParams = &fParams;
state.begin = ZSTD_rust_compressUsingCDict_begin;
state.end = ZSTD_rust_compressUsingCDict_end;
return ZSTD_rust_compressUsingCDictAdvanced(
&state, dst, dstCapacity, src, srcSize);
}
/*! ZSTD_compress_usingCDict() :