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 54BB2BECA for ; Fri, 8 Apr 2022 11:56:38 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 4D52AD221 for ; Fri, 8 Apr 2022 11:56:08 +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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id A84A5D206 for ; Fri, 8 Apr 2022 11:56:07 +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 7E987463F1 for ; Fri, 8 Apr 2022 11:56:07 +0200 (CEST) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Fri, 8 Apr 2022 11:56:00 +0200 Message-Id: <20220408095606.2767234-2-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220408095606.2767234-1-d.csapak@proxmox.com> References: <20220408095606.2767234-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.140 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% 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 T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pbs-devel] [PATCH proxmox 1/4] proxmox-async: add SenderWriter helper 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, 08 Apr 2022 09:56:38 -0000 this wraps around a tokio Sender for Vec, but implements a blocking write. We can use thas as an adapter for something that only takes a writer, and can read from it asynchonously Signed-off-by: Dominik Csapak --- proxmox-async/src/blocking/mod.rs | 3 ++ proxmox-async/src/blocking/sender_writer.rs | 47 +++++++++++++++++++++ 2 files changed, 50 insertions(+) create mode 100644 proxmox-async/src/blocking/sender_writer.rs diff --git a/proxmox-async/src/blocking/mod.rs b/proxmox-async/src/blocking/mod.rs index 28247b3..06f821a 100644 --- a/proxmox-async/src/blocking/mod.rs +++ b/proxmox-async/src/blocking/mod.rs @@ -9,3 +9,6 @@ pub use tokio_writer_adapter::TokioWriterAdapter; mod wrapped_reader_stream; pub use wrapped_reader_stream::WrappedReaderStream; + +mod sender_writer; +pub use sender_writer::SenderWriter; diff --git a/proxmox-async/src/blocking/sender_writer.rs b/proxmox-async/src/blocking/sender_writer.rs new file mode 100644 index 0000000..62682e5 --- /dev/null +++ b/proxmox-async/src/blocking/sender_writer.rs @@ -0,0 +1,47 @@ +use std::io; + +use anyhow::Error; +use tokio::sync::mpsc::Sender; + +/// Wrapper struct around [`tokio::sync::mpsc::Sender`] for `Result, Error>` that implements [`std::io::Write`] +pub struct SenderWriter { + sender: Sender, Error>>, +} + +impl SenderWriter { + pub fn from_sender(sender: tokio::sync::mpsc::Sender, Error>>) -> Self { + Self { sender } + } + + fn write_impl(&mut self, buf: &[u8]) -> io::Result { + if let Err(err) = self.sender.blocking_send(Ok(buf.to_vec())) { + return Err(io::Error::new( + io::ErrorKind::UnexpectedEof, + format!("could not send: {}", err), + )); + } + + Ok(buf.len()) + } + + fn flush_impl(&mut self) -> io::Result<()> { + Ok(()) + } +} + +impl io::Write for SenderWriter { + fn write(&mut self, buf: &[u8]) -> io::Result { + self.write_impl(buf) + } + + fn flush(&mut self) -> io::Result<()> { + self.flush_impl() + } +} + +impl Drop for SenderWriter { + fn drop(&mut self) { + // ignore errors + let _ = self.flush_impl(); + } +} -- 2.30.2