Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions build.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
fn main() {
// See note in Cargo.toml
if cfg!(target_pointer_width = "32") {
#[cfg(any(
feature = "use-system-isal",
feature = "isal-static",
feature = "isal-shared"
))]
let msg = "feature set but ISA-L not supported on 32 bit systems.";

#[cfg(feature = "use-system-isal")]
Expand Down
4 changes: 3 additions & 1 deletion src/capi.rs
Original file line number Diff line number Diff line change
Expand Up @@ -263,6 +263,7 @@ pub extern "C" fn compress(
&mut decompressed,
&mut compressed,
level.map(|v: i32| v as i32),
Some(input_len),
),
#[cfg(feature = "lz4")]
Codec::Lz4 => lz4::compress(&mut decompressed, &mut compressed, level.map(|v| v as _)),
Expand Down Expand Up @@ -388,6 +389,7 @@ pub extern "C" fn compress_into(
&mut decompressed,
&mut compressed,
level.map(|v: i32| v as i32),
Some(input_len),
),
#[cfg(feature = "lz4")]
Codec::Lz4 => lz4::compress(&mut decompressed, &mut compressed, level.map(|v| v as _)),
Expand Down Expand Up @@ -1063,7 +1065,7 @@ mod tests {
#[test]
fn test_zstd_roundtrip() {
let mut expected = Cursor::new(vec![]);
zstd::compress(Cursor::new(DATA), &mut expected, Some(6)).unwrap();
zstd::compress(Cursor::new(DATA), &mut expected, Some(6), Some(DATA.len())).unwrap();
let expected = expected.into_inner();
roundtrip(Codec::Zstd, &expected, 6);
}
Expand Down
2 changes: 1 addition & 1 deletion src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ mod tests {
test_variant!(deflate, None);

#[cfg(feature = "zstd")]
test_variant!(zstd, None);
test_variant!(zstd, None, None);

#[cfg(feature = "zlib")]
test_variant!(zlib, None);
Expand Down
10 changes: 9 additions & 1 deletion src/zstd.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,17 @@ pub fn decompress<W: Write + ?Sized, R: Read>(input: R, output: &mut W) -> Resul

/// Compress gzip data
#[inline(always)]
pub fn compress<W: Write + ?Sized, R: Read>(input: R, output: &mut W, level: Option<i32>) -> Result<usize, Error> {
pub fn compress<W: Write + ?Sized, R: Read>(
input: R,
output: &mut W,
level: Option<i32>,
input_size: Option<usize>,
) -> Result<usize, Error> {
let level = level.unwrap_or_else(|| DEFAULT_COMPRESSION_LEVEL); // 0 will use zstd's default, currently 3
let mut encoder = zstd::stream::read::Encoder::new(input, level)?;

encoder.set_pledged_src_size(input_size.map(|v| v as u64))?;

let n_bytes = std::io::copy(&mut encoder, output)?;
Ok(n_bytes as usize)
}
Loading