From: Wolfgang Bumiller <w.bumiller@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH backup 1/2] proxy: get rid of some unsafe pins
Date: Wed, 12 May 2021 09:29:30 +0200 [thread overview]
Message-ID: <20210512072931.2882-1-w.bumiller@proxmox.com> (raw)
It's easier to follow by just boxing the futures with
Box::pin.
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
---
src/bin/proxmox-backup-proxy.rs | 19 ++++++-------------
1 file changed, 6 insertions(+), 13 deletions(-)
diff --git a/src/bin/proxmox-backup-proxy.rs b/src/bin/proxmox-backup-proxy.rs
index fc773459..e8c31c4d 100644
--- a/src/bin/proxmox-backup-proxy.rs
+++ b/src/bin/proxmox-backup-proxy.rs
@@ -1,6 +1,5 @@
use std::sync::Arc;
use std::path::{Path, PathBuf};
-use std::pin::Pin;
use std::os::unix::io::AsRawFd;
use anyhow::{bail, format_err, Error};
@@ -220,22 +219,16 @@ async fn accept_connection(
) {
let accept_counter = Arc::new(());
- // Note that these must not be moved out/modified directly, they get pinned in the loop and
- // "rearmed" after waking up:
- let mut reload_tls = notify_tls_cert_reload.notified();
- let mut accept = listener.accept();
+ let mut reload_tls = Box::pin(notify_tls_cert_reload.notified());
+ let mut accept = Box::pin(listener.accept());
loop {
let sock;
- // normally we'd use `tokio::pin!()` but we need this to happen outside the loop and we
- // need to be able to "rearm" the futures:
- let reload_tls_pin = unsafe { Pin::new_unchecked(&mut reload_tls) };
- let accept_pin = unsafe { Pin::new_unchecked(&mut accept) };
tokio::select! {
- _ = reload_tls_pin => {
+ _ = &mut reload_tls => {
// rearm the notification:
- reload_tls = notify_tls_cert_reload.notified();
+ reload_tls = Box::pin(notify_tls_cert_reload.notified());
log::info!("reloading certificate");
match make_tls_acceptor() {
@@ -244,14 +237,14 @@ async fn accept_connection(
}
continue;
}
- res = accept_pin => match res {
+ res = &mut accept => match res {
Err(err) => {
eprintln!("error accepting tcp connection: {}", err);
continue;
}
Ok((new_sock, _addr)) => {
// rearm the accept future:
- accept = listener.accept();
+ accept = Box::pin(listener.accept());
sock = new_sock;
}
--
2.20.1
next reply other threads:[~2021-05-12 7:30 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-12 7:29 Wolfgang Bumiller [this message]
2021-05-12 7:29 ` [pbs-devel] [PATCH backup 2/2] proxy: fix accept future "rearming" Wolfgang Bumiller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210512072931.2882-1-w.bumiller@proxmox.com \
--to=w.bumiller@proxmox.com \
--cc=pbs-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox