From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 9600A1FF389 for ; Tue, 7 May 2024 17:53:13 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 2A96111B7C; Tue, 7 May 2024 17:53:16 +0200 (CEST) From: Christian Ebner To: pbs-devel@lists.proxmox.com Date: Tue, 7 May 2024 17:51:51 +0200 Message-Id: <20240507155244.793819-10-c.ebner@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240507155244.793819-1-c.ebner@proxmox.com> References: <20240507155244.793819-1-c.ebner@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.028 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 v5 pxar 09/62] 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: , 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" 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 4: - 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 b0e460b..f817747 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 4152c91..aeaab1d 100644 --- a/src/encoder/mod.rs +++ b/src/encoder/mod.rs @@ -538,6 +538,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 a file offset usable with `add_hardlink` or with error if the encoder instance has diff --git a/src/encoder/sync.rs b/src/encoder/sync.rs index 4bfbc8b..e47f008 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 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel