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

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

Browse Source 
Move ZSTD_initCStream_advanced's public initialization policy into the Rust
projection. Rust owns legacy pledged-size normalization and the reset, pledge,
parameter-check, parameter-copy, and dictionary-load ordering while C retains
the private CCtx parameter mutation callbacks.

Test Plan:
- ulimit -v 41943040; CARGO_BUILD_JOBS=1 cargo test --manifest-path rust/Cargo.toml init_cstream_advanced -- --test-threads=1
- ulimit -v 41943040; CARGO_BUILD_JOBS=1 cargo clippy --manifest-path rust/Cargo.toml --all-targets -- -D warnings
- ulimit -v 41943040; make -B -C programs -j1 zstd
- git diff --cached --check
This commit is contained in:
ddidderr
2026-07-19 12:37:52 +02:00
parent ad1ec27212
commit af1fd3e0fc
2 changed files with 285 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/compress/zstd_compress.c
+57 -13
View File
@@ -167,6 +167,35 @@ typedef char ZSTD_rust_init_cstream_using_dict_state_layout[
== 3 * sizeof(void*)
&& sizeof(ZSTD_rust_initCStreamUsingDictState) == 4 * sizeof(void*))
? 1 : -1];
typedef size_t (*ZSTD_rust_initCStreamAdvancedCheckCParams_f)(
void* context, ZSTD_compressionParameters cParams);
typedef void (*ZSTD_rust_initCStreamAdvancedSetZstdParams_f)(
void* context, const ZSTD_parameters* params);
typedef struct {
void* callbackContext;
ZSTD_rust_initCStreamUsingCDictAdvancedReset_f resetSession;
ZSTD_rust_initCStreamUsingCDictAdvancedSetPledgedSrcSize_f setPledgedSrcSize;
ZSTD_rust_initCStreamAdvancedCheckCParams_f checkCParams;
ZSTD_rust_initCStreamAdvancedSetZstdParams_f setZstdParams;
ZSTD_rust_initCStreamUsingDictLoadDictionary_f loadDictionary;
} ZSTD_rust_initCStreamAdvancedState;
size_t ZSTD_rust_initCStreamAdvanced(
const ZSTD_rust_initCStreamAdvancedState* state,
const ZSTD_parameters* params, unsigned long long pss,
const void* dict, size_t dictSize);
typedef char ZSTD_rust_init_cstream_advanced_state_layout[
(offsetof(ZSTD_rust_initCStreamAdvancedState, callbackContext) == 0
&& offsetof(ZSTD_rust_initCStreamAdvancedState, resetSession) == sizeof(void*)
&& offsetof(ZSTD_rust_initCStreamAdvancedState, setPledgedSrcSize)
== 2 * sizeof(void*)
&& offsetof(ZSTD_rust_initCStreamAdvancedState, checkCParams)
== 3 * sizeof(void*)
&& offsetof(ZSTD_rust_initCStreamAdvancedState, setZstdParams)
== 4 * sizeof(void*)
&& offsetof(ZSTD_rust_initCStreamAdvancedState, loadDictionary)
== 5 * sizeof(void*)
&& sizeof(ZSTD_rust_initCStreamAdvancedState) == 6 * sizeof(void*))
? 1 : -1];
ZSTD_frameProgression ZSTD_rust_frameProgression(U64 consumedSrcSize,
size_t buffered,
U64 producedCSize);
@@ -4992,22 +5021,43 @@ size_t ZSTD_initCStream_usingCDict(ZSTD_CStream* zcs, const ZSTD_CDict* cdict)
* pledgedSrcSize must be exact.
* if srcSize is not known at init time, use value ZSTD_CONTENTSIZE_UNKNOWN.
* dict is loaded with default parameters ZSTD_dct_auto and ZSTD_dlm_byCopy. */
static size_t ZSTD_rust_initCStreamAdvanced_checkCParams(
void* context, ZSTD_compressionParameters cParams)
{
(void)context;
return ZSTD_checkCParams(cParams);
}
static void ZSTD_rust_initCStreamAdvanced_setZstdParams(
void* context, const ZSTD_parameters* params)
{
ZSTD_CCtx* const zcs = (ZSTD_CCtx*)context;
ZSTD_CCtxParams_setZstdParams(&zcs->requestedParams, params);
}
static size_t ZSTD_rust_initCStreamUsingDict_loadDictionary(
void* context, const void* dict, size_t dictSize)
{
return ZSTD_CCtx_loadDictionary((ZSTD_CCtx*)context, dict, dictSize);
}
size_t ZSTD_initCStream_advanced(ZSTD_CStream* zcs,
const void* dict, size_t dictSize,
ZSTD_parameters params, unsigned long long pss)
{
ZSTD_rust_initCStreamAdvancedState state;
/* for compatibility with older programs relying on this behavior.
* Users should now specify ZSTD_CONTENTSIZE_UNKNOWN.
* This line will be removed in the future.
*/
U64 const pledgedSrcSize = (pss==0 && params.fParams.contentSizeFlag==0) ? ZSTD_CONTENTSIZE_UNKNOWN : pss;
DEBUGLOG(4, "ZSTD_initCStream_advanced");
FORWARD_IF_ERROR( ZSTD_CCtx_reset(zcs, ZSTD_reset_session_only) , "");
FORWARD_IF_ERROR( ZSTD_CCtx_setPledgedSrcSize(zcs, pledgedSrcSize) , "");
FORWARD_IF_ERROR( ZSTD_checkCParams(params.cParams) , "");
ZSTD_CCtxParams_setZstdParams(&zcs->requestedParams, &params);
FORWARD_IF_ERROR( ZSTD_CCtx_loadDictionary(zcs, dict, dictSize) , "");
return 0;
state.callbackContext = zcs;
state.resetSession = ZSTD_rust_initCStreamUsingCDictAdvanced_resetSession;
state.setPledgedSrcSize = ZSTD_rust_initCStreamUsingCDictAdvanced_setPledgedSrcSize;
state.checkCParams = ZSTD_rust_initCStreamAdvanced_checkCParams;
state.setZstdParams = ZSTD_rust_initCStreamAdvanced_setZstdParams;
state.loadDictionary = ZSTD_rust_initCStreamUsingDict_loadDictionary;
return ZSTD_rust_initCStreamAdvanced(&state, &params, pss, dict, dictSize);
}
static size_t ZSTD_rust_initCStreamSrcSize_setLevel(
@@ -5017,12 +5067,6 @@ static size_t ZSTD_rust_initCStreamSrcSize_setLevel(
(ZSTD_CCtx*)context, ZSTD_c_compressionLevel, compressionLevel);
}
static size_t ZSTD_rust_initCStreamUsingDict_loadDictionary(
void* context, const void* dict, size_t dictSize)
{
return ZSTD_CCtx_loadDictionary((ZSTD_CCtx*)context, dict, dictSize);
}
size_t ZSTD_initCStream_usingDict(ZSTD_CStream* zcs, const void* dict, size_t dictSize, int compressionLevel)
{
ZSTD_rust_initCStreamUsingDictState state;