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 EF677DAE7 for ; Fri, 22 Sep 2023 09:17:21 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id A7FCB6BA4 for ; Fri, 22 Sep 2023 09:16:51 +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 ; Fri, 22 Sep 2023 09:16:50 +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 521764878E for ; Fri, 22 Sep 2023 09:16:50 +0200 (CEST) From: Christian Ebner To: pbs-devel@lists.proxmox.com Date: Fri, 22 Sep 2023 09:16:08 +0200 Message-Id: <20230922071621.12670-8-c.ebner@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230922071621.12670-1-c.ebner@proxmox.com> References: <20230922071621.12670-1-c.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.122 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] [RFC pxar 7/20] fix #3174: encoder: add helper to incr encoder pos 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: Fri, 22 Sep 2023 07:17:22 -0000 Adds a helper to allow to increase the encoder position by a given size. This is used to increase the position when adding an appendix section to the pxar stream, as these bytes are never encoded directly but rather referenced by already existing chunks. Signed-off-by: Christian Ebner --- 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 3b6c900..3587f65 100644 --- a/src/encoder/aio.rs +++ b/src/encoder/aio.rs @@ -112,6 +112,11 @@ impl<'a, T: SeqWrite + 'a> Encoder<'a, T> { self.inner.finish().await } + /// Add size to encoders position and return new position. + pub fn position_add(&mut self, size: u64) -> u64 { + self.inner.position_add(size) + } + /// Add reference to archive appendix pub async fn add_appendix_ref>( &mut self, diff --git a/src/encoder/mod.rs b/src/encoder/mod.rs index a513ce6..abe21f2 100644 --- a/src/encoder/mod.rs +++ b/src/encoder/mod.rs @@ -626,6 +626,12 @@ impl<'a, T: SeqWrite + 'a> EncoderImpl<'a, T> { self.state.write_position } + #[inline] + pub fn position_add(&mut self, size: u64) -> u64 { + self.state.write_position += size; + self.state.write_position + } + pub async fn create_directory( &mut self, file_name: &Path, diff --git a/src/encoder/sync.rs b/src/encoder/sync.rs index 372ca12..b3d7c44 100644 --- a/src/encoder/sync.rs +++ b/src/encoder/sync.rs @@ -110,6 +110,11 @@ impl<'a, T: SeqWrite + 'a> Encoder<'a, T> { poll_result_once(self.inner.finish()) } + /// Add size to encoders position and return new position. + pub fn position_add(&mut self, size: u64) -> u64 { + self.inner.position_add(size) + } + /// Add reference to archive appendix pub async fn add_appendix_ref>( &mut self, -- 2.39.2