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 D0AC4BC12E for ; Thu, 28 Mar 2024 13:38:07 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 877219CE1 for ; Thu, 28 Mar 2024 13:37:37 +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 CD05D42933 for ; Thu, 28 Mar 2024 13:37:36 +0100 (CET) From: Christian Ebner To: pbs-devel@lists.proxmox.com Date: Thu, 28 Mar 2024 13:36:18 +0100 Message-Id: <20240328123707.336951-10-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 09/58] encoder: add payload position 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:38:07 -0000 Allows to read the current payload offset from the dedicated payload input stream. This is required to get the current offset for calculation of forced boundaries in the proxmox-backup-client, when injecting reused payload chunks into the payload stream. Signed-off-by: Christian Ebner --- changes since version 2: - no changes src/encoder/aio.rs | 5 +++++ src/encoder/mod.rs | 4 ++++ src/encoder/sync.rs | 5 +++++ 3 files changed, 14 insertions(+) diff --git a/src/encoder/aio.rs b/src/encoder/aio.rs index 17ade7d..b9cbe11 100644 --- a/src/encoder/aio.rs +++ b/src/encoder/aio.rs @@ -83,6 +83,11 @@ impl<'a, T: SeqWrite + 'a> Encoder<'a, T> { }) } + /// Get current position for payload stream + pub fn payload_position(&self) -> io::Result { + self.inner.payload_position() + } + // /// Convenience shortcut to add a *regular* file by path including its contents to the archive. // pub async fn add_file( // &mut self, diff --git a/src/encoder/mod.rs b/src/encoder/mod.rs index fcd636d..607cea5 100644 --- a/src/encoder/mod.rs +++ b/src/encoder/mod.rs @@ -503,6 +503,10 @@ impl<'a, T: SeqWrite + 'a> EncoderImpl<'a, T> { Ok(offset) } + pub fn payload_position(&self) -> io::Result { + Ok(PayloadOffset(self.state()?.payload_position())) + } + /// Encode a payload reference pointing to given offset in the separate payload output /// /// Returns with error if the encoder instance has no separate payload output or encoding diff --git a/src/encoder/sync.rs b/src/encoder/sync.rs index 48942b9..a63a3cd 100644 --- a/src/encoder/sync.rs +++ b/src/encoder/sync.rs @@ -100,6 +100,11 @@ impl<'a, T: SeqWrite + 'a> Encoder<'a, T> { )) } + /// Get current payload position for payload stream + pub fn payload_position(&self) -> io::Result { + self.inner.payload_position() + } + /// Encode a payload reference pointing to given offset in the separate payload output /// /// Returns with error if the encoder instance has no separate payload output or encoding -- 2.39.2