Proxmox/proxmox
5
0
Fork 1
Code Issues Pull Requests Releases Activity

daemon: boxed FnOnce has been usable for a while

Browse Source 
While technically an API break, we don't use the public API for this
anywhere and the trait we're changing is explicitly marked as
`#[doc(hidden)]`.

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
This commit is contained in:
Wolfgang Bumiller 2024-07-24 16:27:30 +02:00
parent 4502bc3b73
commit 35372b5337
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
proxmox-daemon/src/server.rs
View File

@ -16,8 +16,7 @@ use nix::unistd::{fork, ForkResult};
use proxmox_sys::fd::fd_change_cloexec; use proxmox_sys::fd::fd_change_cloexec;
use proxmox_sys::fs::CreateOptions; use proxmox_sys::fs::CreateOptions;
// Unfortunately FnBox is nightly-only and Box<FnOnce> is unusable, so just use Box<Fn>... type BoxedStoreFunc = Box<dyn FnOnce() -> Result<String, Error> + UnwindSafe + Send>;
type BoxedStoreFunc = Box<dyn FnMut() -> Result<String, Error> + UnwindSafe + Send>;
// Helper trait to "store" something in the environment to be re-used after re-executing the // Helper trait to "store" something in the environment to be re-used after re-executing the
// service on a reload. // service on a reload.
@ -76,7 +75,7 @@ impl Reloader {
} }
fn pre_exec(self) -> Result<(), Error> { fn pre_exec(self) -> Result<(), Error> {
for mut item in self.pre_exec { for item in self.pre_exec {
std::env::set_var(item.name, (item.store_fn)()?); std::env::set_var(item.name, (item.store_fn)()?);
} }
Ok(()) Ok(())
@ -232,14 +231,13 @@ impl Reloader {
} }
fn fd_store_func(fd: RawFd) -> Result<BoxedStoreFunc, Error> { fn fd_store_func(fd: RawFd) -> Result<BoxedStoreFunc, Error> {
let mut fd_opt = Some(unsafe { let fd = unsafe {
OwnedFd::from_raw_fd(nix::fcntl::fcntl( OwnedFd::from_raw_fd(nix::fcntl::fcntl(
fd, fd,
nix::fcntl::FcntlArg::F_DUPFD_CLOEXEC(0), nix::fcntl::FcntlArg::F_DUPFD_CLOEXEC(0),
)?) )?)
}); };
Ok(Box::new(move || { Ok(Box::new(move || {
let fd = fd_opt.take().unwrap();
fd_change_cloexec(fd.as_raw_fd(), false)?; fd_change_cloexec(fd.as_raw_fd(), false)?;
Ok(fd.into_raw_fd().to_string()) Ok(fd.into_raw_fd().to_string())
})) }))