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 2D945BC016 for ; Thu, 28 Mar 2024 13:37:40 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 9DBF09D77 for ; Thu, 28 Mar 2024 13:37:38 +0100 (CET) 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 ; Thu, 28 Mar 2024 13:37:37 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 32A6742904 for ; Thu, 28 Mar 2024 13:37:37 +0100 (CET) From: Christian Ebner To: pbs-devel@lists.proxmox.com Date: Thu, 28 Mar 2024 13:36:19 +0100 Message-Id: <20240328123707.336951-11-c.ebner@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240328123707.336951-1-c.ebner@proxmox.com> References: <20240328123707.336951-1-c.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.031 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 v3 pxar 10/58] encoder: add payload advance capability 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: Thu, 28 Mar 2024 12:37:40 -0000 Allows to advance the payload writer position by a given size. This is used to update the encoders payload input position when injecting reused chunks for files with unchanged metadata. Signed-off-by: Christian Ebner --- changes since version 2: - wrap size in PayloadOffset to have additional type check src/encoder/aio.rs | 5 +++++ src/encoder/mod.rs | 6 ++++++ src/encoder/sync.rs | 5 +++++ 3 files changed, 16 insertions(+) diff --git a/src/encoder/aio.rs b/src/encoder/aio.rs index b9cbe11..6da32bd 100644 --- a/src/encoder/aio.rs +++ b/src/encoder/aio.rs @@ -124,6 +124,11 @@ impl<'a, T: SeqWrite + 'a> Encoder<'a, T> { .await } + /// Add size to payload stream + pub fn advance(&mut self, size: PayloadOffset) -> io::Result<()> { + self.inner.advance(size) + } + /// Create a new subdirectory. Note that the subdirectory has to be finished by calling the /// `finish()` method, otherwise the entire archive will be in an error state. pub async fn create_directory>( diff --git a/src/encoder/mod.rs b/src/encoder/mod.rs index 607cea5..6458bc0 100644 --- a/src/encoder/mod.rs +++ b/src/encoder/mod.rs @@ -543,6 +543,12 @@ impl<'a, T: SeqWrite + 'a> EncoderImpl<'a, T> { Ok(()) } + /// Add size to payload stream + pub fn advance(&mut self, size: PayloadOffset) -> io::Result<()> { + self.state_mut()?.payload_write_position += size.raw(); + Ok(()) + } + /// Return a file offset usable with `add_hardlink`. pub async fn add_symlink( &mut self, diff --git a/src/encoder/sync.rs b/src/encoder/sync.rs index a63a3cd..a6e16f4 100644 --- a/src/encoder/sync.rs +++ b/src/encoder/sync.rs @@ -124,6 +124,11 @@ impl<'a, T: SeqWrite + 'a> Encoder<'a, T> { )) } + /// Add size to payload stream + pub fn advance(&mut self, size: PayloadOffset) -> io::Result<()> { + self.inner.advance(size) + } + /// Create a new subdirectory. Note that the subdirectory has to be finished by calling the /// `finish()` method, otherwise the entire archive will be in an error state. pub fn create_directory>( -- 2.39.2