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

feat(compress): move resetCStream policy into Rust

Browse Source 
Move the public CStream reset wrapper's pledge normalization, callback order,
and error short-circuiting into Rust. Keep the C-owned context reset and
pledged-size mutation behind opaque callbacks with an explicit ABI projection.

Test Plan:
- ulimit -v 41943040; CARGO_BUILD_JOBS=1 cargo test --manifest-path rust/Cargo.toml reset_cstream -- --test-threads=1
- ulimit -v 41943040; make -B -C programs -j1 zstd
- git diff --cached --check
This commit is contained in:
ddidderr
2026-07-19 11:46:18 +02:00
parent df6ecd0e2f
commit fe6cf3bccc
2 changed files with 175 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/compress/zstd_compress.c
+33 -9
View File
@@ -51,6 +51,23 @@ int ZSTD_rust_updateFrameProgression(unsigned long long* consumedSrcSize,
size_t ZSTD_rust_setPledgedSrcSize(int streamStage,
unsigned long long pledgedSrcSize,
unsigned long long* pledgedSrcSizePlusOne);
typedef size_t (*ZSTD_rust_resetCStreamReset_f)(void* context);
typedef size_t (*ZSTD_rust_resetCStreamSetPledgedSrcSize_f)(
void* context, unsigned long long pledgedSrcSize);
typedef struct {
void* callbackContext;
ZSTD_rust_resetCStreamReset_f resetSession;
ZSTD_rust_resetCStreamSetPledgedSrcSize_f setPledgedSrcSize;
} ZSTD_rust_resetCStreamState;
size_t ZSTD_rust_resetCStream(const ZSTD_rust_resetCStreamState* state,
unsigned long long pss);
typedef char ZSTD_rust_reset_cstream_state_layout[
(offsetof(ZSTD_rust_resetCStreamState, callbackContext) == 0
&& offsetof(ZSTD_rust_resetCStreamState, resetSession) == sizeof(void*)
&& offsetof(ZSTD_rust_resetCStreamState, setPledgedSrcSize)
== 2 * sizeof(void*)
&& sizeof(ZSTD_rust_resetCStreamState) == 3 * sizeof(void*))
? 1 : -1];
ZSTD_frameProgression ZSTD_rust_frameProgression(U64 consumedSrcSize,
size_t buffered,
U64 producedCSize);
@@ -4770,17 +4787,24 @@ static ZSTD_CParamMode_e ZSTD_getCParamMode(ZSTD_CDict const* cdict, ZSTD_CCtx_p
/* ZSTD_resetCStream():
* pledgedSrcSize == 0 means "unknown" */
static size_t ZSTD_rust_resetCStream_resetSession(void* context)
{
return ZSTD_CCtx_reset((ZSTD_CCtx*)context, ZSTD_reset_session_only);
}
static size_t ZSTD_rust_resetCStream_setPledgedSrcSize(
void* context, unsigned long long pledgedSrcSize)
{
return ZSTD_CCtx_setPledgedSrcSize((ZSTD_CCtx*)context, pledgedSrcSize);
}
size_t ZSTD_resetCStream(ZSTD_CStream* zcs, unsigned long long pss)
{
/* temporary : 0 interpreted as "unknown" during transition period.
* Users willing to specify "unknown" **must** use ZSTD_CONTENTSIZE_UNKNOWN.
* 0 will be interpreted as "empty" in the future.
*/
U64 const pledgedSrcSize = (pss==0) ? ZSTD_CONTENTSIZE_UNKNOWN : pss;
DEBUGLOG(4, "ZSTD_resetCStream: pledgedSrcSize = %u", (unsigned)pledgedSrcSize);
FORWARD_IF_ERROR( ZSTD_CCtx_reset(zcs, ZSTD_reset_session_only) , "");
FORWARD_IF_ERROR( ZSTD_CCtx_setPledgedSrcSize(zcs, pledgedSrcSize) , "");
return 0;
ZSTD_rust_resetCStreamState state;
state.callbackContext = zcs;
state.resetSession = ZSTD_rust_resetCStream_resetSession;
state.setPledgedSrcSize = ZSTD_rust_resetCStream_setPledgedSrcSize;
return ZSTD_rust_resetCStream(&state, pss);
}
/*! ZSTD_initCStream_internal() :