feat(compress): move cdict stream init policy into Rust
Move ZSTD_initCStream_usingCDict's reset and CDict-reference ordering into a small Rust projection. Keep the opaque C context and dictionary operation behind callbacks with an explicit layout-checked ABI boundary. Test Plan: - ulimit -v 41943040; CARGO_BUILD_JOBS=1 cargo test --manifest-path rust/Cargo.toml init_cstream_using_cdict -- --test-threads=1 - ulimit -v 41943040; make -B -C programs -j1 zstd - git diff --cached --check
This commit is contained in:
@@ -99,6 +99,19 @@ typedef char ZSTD_rust_init_cstream_using_cdict_advanced_state_layout[
|
||||
== 4 * sizeof(void*)
|
||||
&& sizeof(ZSTD_rust_initCStreamUsingCDictAdvancedState) == 5 * sizeof(void*))
|
||||
? 1 : -1];
|
||||
typedef struct {
|
||||
void* callbackContext;
|
||||
ZSTD_rust_initCStreamUsingCDictAdvancedReset_f resetSession;
|
||||
ZSTD_rust_initCStreamUsingCDictAdvancedRefCDict_f refCDict;
|
||||
} ZSTD_rust_initCStreamUsingCDictState;
|
||||
size_t ZSTD_rust_initCStreamUsingCDict(
|
||||
const ZSTD_rust_initCStreamUsingCDictState* state, const void* cdict);
|
||||
typedef char ZSTD_rust_init_cstream_using_cdict_state_layout[
|
||||
(offsetof(ZSTD_rust_initCStreamUsingCDictState, callbackContext) == 0
|
||||
&& offsetof(ZSTD_rust_initCStreamUsingCDictState, resetSession) == sizeof(void*)
|
||||
&& offsetof(ZSTD_rust_initCStreamUsingCDictState, refCDict) == 2 * sizeof(void*)
|
||||
&& sizeof(ZSTD_rust_initCStreamUsingCDictState) == 3 * sizeof(void*))
|
||||
? 1 : -1];
|
||||
ZSTD_frameProgression ZSTD_rust_frameProgression(U64 consumedSrcSize,
|
||||
size_t buffered,
|
||||
U64 producedCSize);
|
||||
@@ -4911,10 +4924,12 @@ size_t ZSTD_initCStream_usingCDict_advanced(ZSTD_CStream* zcs,
|
||||
/* note : cdict must outlive compression session */
|
||||
size_t ZSTD_initCStream_usingCDict(ZSTD_CStream* zcs, const ZSTD_CDict* cdict)
|
||||
{
|
||||
ZSTD_rust_initCStreamUsingCDictState state;
|
||||
DEBUGLOG(4, "ZSTD_initCStream_usingCDict");
|
||||
FORWARD_IF_ERROR( ZSTD_CCtx_reset(zcs, ZSTD_reset_session_only) , "");
|
||||
FORWARD_IF_ERROR( ZSTD_CCtx_refCDict(zcs, cdict) , "");
|
||||
return 0;
|
||||
state.callbackContext = zcs;
|
||||
state.resetSession = ZSTD_rust_initCStreamUsingCDictAdvanced_resetSession;
|
||||
state.refCDict = ZSTD_rust_initCStreamUsingCDictAdvanced_refCDict;
|
||||
return ZSTD_rust_initCStreamUsingCDict(&state, cdict);
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user