feat(cli): move separate decompression scheduling into Rust

Move the separate-destination multi-file decompression loop into the Rust projection so Rust owns file iteration, progress counters, and aggregate error handling. Keep destination-name construction, mirror setup, source opening, format dispatch, diagnostics, and source removal in the C callback boundary. Test Plan: - ulimit -v 41943040; CARGO_BUILD_JOBS=1 cargo test --manifest-path rust/Cargo.toml decompression_multiple_separate -- --test-threads=1 - ulimit -v 41943040; make -B -C programs -j1 zstd - ulimit -v 41943040; make -B -C tests -j1 test-cli-tests
2026-07-19 11:25:59 +02:00
parent bc8c005c23
commit 845f77924a
2 changed files with 221 additions and 20 deletions
@@ -334,6 +334,8 @@ const _: () = {

 pub type FIO_rust_decompress_multiple_file_fn =
    unsafe extern "C" fn(*mut c_void, *const c_char, *const c_char) -> c_int;
+pub type FIO_rust_decompress_multiple_separate_file_fn =
+    unsafe extern "C" fn(*mut c_void, *const c_char) -> c_int;

 /// Rust owns only the shared-destination file iteration and aggregate error
 /// handling. C retains source opening, format dispatch, diagnostics, and
@@ -368,6 +370,40 @@ const _: () = {
    assert!(size_of::<FIO_rust_decompress_multiple_projection_t>() == 5 * size_of::<usize>());
 };

+/// Rust owns only the separate-destination file iteration and aggregate error
+/// handling. C retains destination-name construction, source opening, format
+/// dispatch, diagnostics, and source removal through the per-source callback.
+#[repr(C)]
+pub struct FIO_rust_decompress_multiple_separate_projection_t {
+    pub f_ctx: *mut c_void,
+    pub src_names_table: *const *const c_char,
+    pub opaque: *mut c_void,
+    pub decompress_file: Option<FIO_rust_decompress_multiple_separate_file_fn>,
+}
+const _: () = {
+    assert!(std::mem::offset_of!(FIO_rust_decompress_multiple_separate_projection_t, f_ctx) == 0);
+    assert!(
+        std::mem::offset_of!(
+            FIO_rust_decompress_multiple_separate_projection_t,
+            src_names_table
+        ) == size_of::<usize>()
+    );
+    assert!(
+        std::mem::offset_of!(FIO_rust_decompress_multiple_separate_projection_t, opaque)
+            == 2 * size_of::<usize>()
+    );
+    assert!(
+        std::mem::offset_of!(
+            FIO_rust_decompress_multiple_separate_projection_t,
+            decompress_file
+        ) == 3 * size_of::<usize>()
+    );
+    assert!(size_of::<FIO_rust_decompress_multiple_separate_file_fn>() == size_of::<usize>());
+    assert!(
+        size_of::<FIO_rust_decompress_multiple_separate_projection_t>() == 4 * size_of::<usize>()
+    );
+};
+
 pub const FIO_RUST_ZSTD_OK: c_int = 0;
 pub const FIO_RUST_ZSTD_COMPRESS_ERROR: c_int = 1;
 pub const FIO_RUST_ZSTD_INCOMPLETE_INPUT: c_int = 2;
@@ -2344,6 +2380,41 @@ pub unsafe extern "C" fn FIO_rust_decompressMultipleFilenames(
    error
 }

+/// Iterate files that each receive a separate destination. The C callback
+/// retains destination-name construction, source opening, format dispatch,
+/// diagnostics, and `--rm`; Rust preserves the non-short-circuiting loop and
+/// counter updates.
+#[no_mangle]
+pub unsafe extern "C" fn FIO_rust_decompressMultipleSeparateFilenames(
+    projection: *const FIO_rust_decompress_multiple_separate_projection_t,
+) -> c_int {
+    assert!(!projection.is_null());
+    let projection = unsafe { &*projection };
+    assert!(!projection.f_ctx.is_null());
+    assert!(!projection.src_names_table.is_null());
+    let decompress_file = projection
+        .decompress_file
+        .expect("separate-destination decompression callback is required");
+
+    let f_ctx = projection.f_ctx.cast::<FIO_rust_compression_context_t>();
+    let mut error = 0;
+    while unsafe { (*f_ctx).currFileIdx < (*f_ctx).nbFilesTotal } {
+        let file_index = unsafe { (*f_ctx).currFileIdx as usize };
+        let src_file_name = unsafe { *projection.src_names_table.add(file_index) };
+        let status = unsafe { decompress_file(projection.opaque, src_file_name) };
+        if status == 0 {
+            unsafe {
+                (*f_ctx).nbFilesProcessed = (*f_ctx).nbFilesProcessed.wrapping_add(1);
+            }
+        }
+        error |= status;
+        unsafe {
+            (*f_ctx).currFileIdx = (*f_ctx).currFileIdx.wrapping_add(1);
+        }
+    }
+    error
+}
+
 #[inline]
 fn zstd_adapt_level(projection: &FIO_rust_zstd_adapt_projection_t, slower: bool) -> c_int {
    if slower {
@@ -4668,6 +4739,20 @@ mod tests {
        status
    }

+    unsafe extern "C" fn record_multiple_separate_decompression_file(
+        opaque: *mut c_void,
+        source: *const c_char,
+    ) -> c_int {
+        let state = unsafe { &mut *opaque.cast::<MultipleDecompressionState>() };
+        let status = state
+            .statuses
+            .get(state.sources.len())
+            .copied()
+            .unwrap_or(0);
+        state.sources.push(source);
+        status
+    }
+
    #[test]
    fn compression_multiple_separate_destinations_preserves_order_and_counters() {
        let source_names = [c"zero".as_ptr(), c"one".as_ptr(), c"two".as_ptr()];
@@ -4872,6 +4957,70 @@ mod tests {
        assert_eq!(context.nbFilesProcessed, 4);
    }

+    #[test]
+    fn decompression_multiple_separate_destinations_preserves_order_and_counters() {
+        let source_names = [c"zero".as_ptr(), c"one".as_ptr(), c"two".as_ptr()];
+        let mut context = FIO_rust_compression_context_t {
+            nbFilesTotal: 3,
+            hasStdinInput: 0,
+            hasStdoutOutput: 0,
+            currFileIdx: 1,
+            nbFilesProcessed: 5,
+            totalBytesInput: 0,
+            totalBytesOutput: 0,
+        };
+        let mut state = MultipleDecompressionState {
+            statuses: vec![0, 0],
+            ..MultipleDecompressionState::default()
+        };
+        let projection = FIO_rust_decompress_multiple_separate_projection_t {
+            f_ctx: (&mut context as *mut FIO_rust_compression_context_t).cast(),
+            src_names_table: source_names.as_ptr(),
+            opaque: (&mut state as *mut MultipleDecompressionState).cast(),
+            decompress_file: Some(record_multiple_separate_decompression_file),
+        };
+
+        assert_eq!(
+            unsafe { FIO_rust_decompressMultipleSeparateFilenames(&projection) },
+            0
+        );
+        assert_eq!(state.sources, vec![source_names[1], source_names[2]]);
+        assert_eq!(context.currFileIdx, 3);
+        assert_eq!(context.nbFilesProcessed, 7);
+    }
+
+    #[test]
+    fn decompression_multiple_separate_destinations_accumulates_errors_without_short_circuiting() {
+        let source_names = [c"one".as_ptr(), c"two".as_ptr(), c"three".as_ptr()];
+        let mut context = FIO_rust_compression_context_t {
+            nbFilesTotal: 3,
+            hasStdinInput: 0,
+            hasStdoutOutput: 0,
+            currFileIdx: 0,
+            nbFilesProcessed: 4,
+            totalBytesInput: 0,
+            totalBytesOutput: 0,
+        };
+        let mut state = MultipleDecompressionState {
+            statuses: vec![1, 4, 2],
+            ..MultipleDecompressionState::default()
+        };
+        let projection = FIO_rust_decompress_multiple_separate_projection_t {
+            f_ctx: (&mut context as *mut FIO_rust_compression_context_t).cast(),
+            src_names_table: source_names.as_ptr(),
+            opaque: (&mut state as *mut MultipleDecompressionState).cast(),
+            decompress_file: Some(record_multiple_separate_decompression_file),
+        };
+
+        assert_eq!(
+            unsafe { FIO_rust_decompressMultipleSeparateFilenames(&projection) },
+            1 | 4 | 2
+        );
+        assert_eq!(state.sources, source_names);
+        assert_eq!(context.currFileIdx, 3);
+        assert_eq!(context.nbFilesProcessed, 4);
+    }
+
    struct ZstdProjectionState {
        input: [u8; 5],
        input_pos: usize,