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

feat(compress): move advanced begin policy into Rust

Browse Source 
Move public ZSTD_compressBegin_advanced parameter validation and init-then-begin
sequencing behind a Rust-owned boundary. Keep C responsible for private
ZSTD_CCtx_params initialization and ZSTD_compressBegin_internal through
explicit callbacks.

Test Plan:
- ulimit -v 41943040; CARGO_BUILD_JOBS=1 cargo test --manifest-path rust/Cargo.toml --release compress_begin_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 15:57:21 +02:00
parent 57bad12ec5
commit feee053725
2 changed files with 196 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/compress/zstd_compress.c
+50 -5
View File
@@ -422,6 +422,31 @@ typedef char ZSTD_rust_compress_using_dict_state_layout[
== 3 * sizeof(void*)
&& sizeof(ZSTD_rust_compressUsingDictState) == 4 * sizeof(void*))
? 1 : -1];
typedef void (*ZSTD_rust_compressBeginAdvancedInitParams_f)(
void* cctxParams, const ZSTD_parameters* params);
typedef size_t (*ZSTD_rust_compressBeginAdvancedBegin_f)(
void* context, const void* dict, size_t dictSize,
const void* cctxParams, U64 pledgedSrcSize);
typedef struct {
void* cctx;
void* cctxParams;
ZSTD_rust_compressBeginAdvancedInitParams_f initParams;
ZSTD_rust_compressBeginAdvancedBegin_f begin;
} ZSTD_rust_compressBeginAdvancedState;
size_t ZSTD_rust_compressBeginAdvanced(
const ZSTD_rust_compressBeginAdvancedState* state,
const void* dict, size_t dictSize,
const ZSTD_parameters* params, U64 pledgedSrcSize);
typedef char ZSTD_rust_compress_begin_advanced_state_layout[
(offsetof(ZSTD_rust_compressBeginAdvancedState, cctx) == 0
&& offsetof(ZSTD_rust_compressBeginAdvancedState, cctxParams)
== sizeof(void*)
&& offsetof(ZSTD_rust_compressBeginAdvancedState, initParams)
== 2 * sizeof(void*)
&& offsetof(ZSTD_rust_compressBeginAdvancedState, begin)
== 3 * sizeof(void*)
&& sizeof(ZSTD_rust_compressBeginAdvancedState) == 4 * sizeof(void*))
? 1 : -1];
ZSTD_frameProgression ZSTD_rust_frameProgression(U64 consumedSrcSize,
size_t buffered,
U64 producedCSize);
@@ -4841,6 +4866,24 @@ static size_t ZSTD_rust_compressBeginUsingDict_begin(
pledgedSrcSize, ZSTDb_not_buffered);
}
static void ZSTD_rust_compressBeginAdvanced_initParams(
void* cctxParams, const ZSTD_parameters* params)
{
ZSTD_CCtxParams_init_internal(
(ZSTD_CCtx_params*)cctxParams, params, ZSTD_NO_CLEVEL);
}
static size_t ZSTD_rust_compressBeginAdvanced_begin(
void* context, const void* dict, size_t dictSize,
const void* cctxParams, U64 pledgedSrcSize)
{
return ZSTD_compressBegin_internal(
(ZSTD_CCtx*)context, dict, dictSize,
ZSTD_dct_auto, ZSTD_dtlm_fast, NULL,
(const ZSTD_CCtx_params*)cctxParams,
pledgedSrcSize, ZSTDb_not_buffered);
}
size_t ZSTD_compressBegin_advanced_internal(ZSTD_CCtx* cctx,
const void* dict, size_t dictSize,
ZSTD_dictContentType_e dictContentType,
@@ -4865,12 +4908,14 @@ size_t ZSTD_compressBegin_advanced(ZSTD_CCtx* cctx,
const void* dict, size_t dictSize,
ZSTD_parameters params, unsigned long long pledgedSrcSize)
{
ZSTD_rust_compressBeginAdvancedState state;
ZSTD_CCtx_params cctxParams;
ZSTD_CCtxParams_init_internal(&cctxParams, &params, ZSTD_NO_CLEVEL);
return ZSTD_compressBegin_advanced_internal(cctx,
dict, dictSize, ZSTD_dct_auto, ZSTD_dtlm_fast,
NULL /*cdict*/,
&cctxParams, pledgedSrcSize);
state.cctx = cctx;
state.cctxParams = &cctxParams;
state.initParams = ZSTD_rust_compressBeginAdvanced_initParams;
state.begin = ZSTD_rust_compressBeginAdvanced_begin;
return ZSTD_rust_compressBeginAdvanced(
&state, dict, dictSize, &params, pledgedSrcSize);
}
static size_t