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 E564B6A48B for ; Tue, 16 Feb 2021 18:07:30 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id DB39618DE5 for ; Tue, 16 Feb 2021 18:07:30 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (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 id 6EF7F18DBF for ; Tue, 16 Feb 2021 18:07:29 +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 3A7DD461ED for ; Tue, 16 Feb 2021 18:07:29 +0100 (CET) From: Stefan Reiter To: pbs-devel@lists.proxmox.com Date: Tue, 16 Feb 2021 18:06:49 +0100 Message-Id: <20210216170710.31767-2-s.reiter@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210216170710.31767-1-s.reiter@proxmox.com> References: <20210216170710.31767-1-s.reiter@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.030 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment 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_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [aio.rs] Subject: [pbs-devel] [PATCH pxar 01/22] decoder/aio: add contents() and content_size() calls 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: Tue, 16 Feb 2021 17:07:30 -0000 Returns a tokio AsyncRead implementation for its "Contents" to keep with the aio theme. Signed-off-by: Stefan Reiter --- src/decoder/aio.rs | 43 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 42 insertions(+), 1 deletion(-) diff --git a/src/decoder/aio.rs b/src/decoder/aio.rs index 82030b0..5cc6694 100644 --- a/src/decoder/aio.rs +++ b/src/decoder/aio.rs @@ -56,6 +56,18 @@ impl Decoder { self.inner.next_do().await.transpose() } + /// Get a reader for the contents of the current entry, if the entry has contents. + /// Only available for feature "tokio-io", since it returns an AsyncRead reader. + #[cfg(feature = "tokio-io")] + pub fn contents(&mut self) -> Option> { + self.inner.content_reader().map(|inner| Contents { inner }) + } + + /// Get the size of the current contents, if the entry has contents. + pub fn content_size(&self) -> Option { + self.inner.content_size() + } + /// Include goodbye tables in iteration. pub fn enable_goodbye_entries(&mut self, on: bool) { self.inner.with_goodbye_tables = on; @@ -93,7 +105,36 @@ mod tok { } } } + + pub struct Contents<'a, T: crate::decoder::SeqRead> { + pub(crate) inner: crate::decoder::Contents<'a, T>, + } + + impl<'a, T: crate::decoder::SeqRead> tokio::io::AsyncRead for Contents<'a, T> { + fn poll_read( + self: Pin<&mut Self>, + cx: &mut Context<'_>, + buf: &mut tokio::io::ReadBuf<'_>, + ) -> Poll> { + unsafe { + // Safety: poll_seq_read will only write to the buffer, so we don't need to + // initialize it first, we can treat is a &[u8] immediately as long as we uphold + // the ReadBuf invariants in the conditional below + let write_buf = + &mut *(buf.unfilled_mut() as *mut [std::mem::MaybeUninit] as *mut [u8]); + let result = self + .map_unchecked_mut(|this| &mut this.inner as &mut dyn crate::decoder::SeqRead) + .poll_seq_read(cx, write_buf); + if let Poll::Ready(Ok(n)) = result { + // if we've written data, advance both initialized and filled bytes cursor + buf.assume_init(buf.filled().len() + n); + buf.advance(n); + } + result.map(|_| Ok(())) + } + } + } } #[cfg(feature = "tokio-io")] -use tok::TokioReader; +use tok::{Contents, TokioReader}; -- 2.20.1