From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 94CEA946FC for ; Wed, 10 Apr 2024 16:30:39 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 760FE122BD for ; Wed, 10 Apr 2024 16:30:39 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Wed, 10 Apr 2024 16:30:38 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 29B9143BFD for ; Wed, 10 Apr 2024 16:30:38 +0200 (CEST) From: Maximiliano Sandoval To: pbs-devel@lists.proxmox.com Date: Wed, 10 Apr 2024 16:30:32 +0200 Message-Id: <20240410143036.81807-2-m.sandoval@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240410143036.81807-1-m.sandoval@proxmox.com> References: <20240410143036.81807-1-m.sandoval@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.013 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pbs-devel] [PATCH proxmox v3 1/5] compression: deflate: Move encoder into a mod X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Apr 2024 14:30:39 -0000 This allows to add a decompression mod inside the deflate mod. This does not touch the public API. Signed-off-by: Maximiliano Sandoval --- proxmox-compression/src/{ => deflate}/compression.rs | 6 ++---- proxmox-compression/src/deflate/mod.rs | 5 +++++ proxmox-compression/src/lib.rs | 4 ++-- proxmox-compression/src/zip.rs | 2 +- 4 files changed, 10 insertions(+), 7 deletions(-) rename proxmox-compression/src/{ => deflate}/compression.rs (97%) create mode 100644 proxmox-compression/src/deflate/mod.rs diff --git a/proxmox-compression/src/compression.rs b/proxmox-compression/src/deflate/compression.rs similarity index 97% rename from proxmox-compression/src/compression.rs rename to proxmox-compression/src/deflate/compression.rs index 632a5991..6e6a151d 100644 --- a/proxmox-compression/src/compression.rs +++ b/proxmox-compression/src/deflate/compression.rs @@ -12,8 +12,6 @@ use tokio::io::{AsyncRead, AsyncReadExt, AsyncWrite, AsyncWriteExt}; use proxmox_io::ByteBuffer; use proxmox_lang::io_format_err; -const BUFFER_SIZE: usize = 8192; - pub enum Level { Fastest, Best, @@ -53,7 +51,7 @@ impl DeflateEncoder { Self { inner, compressor: Compress::new(level, false), - buffer: ByteBuffer::with_capacity(BUFFER_SIZE), + buffer: ByteBuffer::with_capacity(super::BUFFER_SIZE), input_buffer: Bytes::new(), state: EncoderState::Reading, } @@ -109,7 +107,7 @@ impl DeflateEncoder { where R: AsyncRead + Unpin, { - let mut buffer = ByteBuffer::with_capacity(BUFFER_SIZE); + let mut buffer = ByteBuffer::with_capacity(super::BUFFER_SIZE); let mut eof = false; loop { if !eof && !buffer.is_full() { diff --git a/proxmox-compression/src/deflate/mod.rs b/proxmox-compression/src/deflate/mod.rs new file mode 100644 index 00000000..514ccbdc --- /dev/null +++ b/proxmox-compression/src/deflate/mod.rs @@ -0,0 +1,5 @@ +mod compression; + +pub use compression::{DeflateEncoder, Level}; + +const BUFFER_SIZE: usize = 8192; diff --git a/proxmox-compression/src/lib.rs b/proxmox-compression/src/lib.rs index 1fcfb977..239de623 100644 --- a/proxmox-compression/src/lib.rs +++ b/proxmox-compression/src/lib.rs @@ -1,6 +1,6 @@ -mod compression; -pub use compression::*; +pub use deflate::{DeflateEncoder, Level}; +pub(crate) mod deflate; pub mod tar; pub mod zip; pub mod zstd; diff --git a/proxmox-compression/src/zip.rs b/proxmox-compression/src/zip.rs index d2d3fd80..3ccece9b 100644 --- a/proxmox-compression/src/zip.rs +++ b/proxmox-compression/src/zip.rs @@ -22,7 +22,7 @@ use tokio::io::{AsyncRead, AsyncWrite, AsyncWriteExt, ReadBuf}; use crc32fast::Hasher; use proxmox_time::gmtime; -use crate::compression::{DeflateEncoder, Level}; +use crate::deflate::{DeflateEncoder, Level}; const LOCAL_FH_SIG: u32 = 0x04034B50; const LOCAL_FF_SIG: u32 = 0x08074B50; -- 2.39.2