From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ronja.mits.lan by ronja.mits.lan with LMTP id sMneC54sfGZmaQAAxxbTJA (envelope-from ); Wed, 26 Jun 2024 16:58:38 +0200 Received: from proxmox-new.maurer-it.com (unknown [192.168.2.33]) by ronja.mits.lan (Postfix) with ESMTPS id 1C8B2F6462A; Wed, 26 Jun 2024 16:58: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 01DE748740; Wed, 26 Jun 2024 16:58:38 +0200 (CEST) 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 (4096 bits)) (No client certificate requested) by proxmox-new.maurer-it.com (Proxmox) with ESMTPS; Wed, 26 Jun 2024 16:58:37 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id D9F7A534B; Wed, 26 Jun 2024 16:58:36 +0200 (CEST) From: Maximiliano Sandoval To: pbs-devel@lists.proxmox.com Date: Wed, 26 Jun 2024 16:57:57 +0200 Message-Id: <20240626145801.751326-2-m.sandoval@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240626145801.751326-1-m.sandoval@proxmox.com> References: <20240626145801.751326-1-m.sandoval@proxmox.com> MIME-Version: 1.0 Subject: [pbs-devel] [PATCH promox v4 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: , Reply-To: Proxmox Backup Server development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pbs-devel-bounces@lists.proxmox.com Sender: "pbs-devel" X-SPAM-LEVEL: Spam detection results: 0 DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods MAILING_LIST_MULTI -2 Multiple indicators imply a widely-seen list manager RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record 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..70d88afe 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}; +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 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel