tyler
/
proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

timer: replace mem::uninitialized 

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
This commit is contained in:
Wolfgang Bumiller 2019-08-22 11:07:10 +02:00
parent 6100071f4e
commit b7f44ace92
1 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/tools/timer.rs
View File

@ -3,8 +3,9 @@
//! This module provides a wrapper around POSIX timers (see `timer_create(2)`) and utilities to //! This module provides a wrapper around POSIX timers (see `timer_create(2)`) and utilities to
//! setup thread-targeted signaling and signal masks. //! setup thread-targeted signaling and signal masks.
use std::{io, mem}; use std::mem::MaybeUninit;
use std::time::Duration; use std::time::Duration;
use std::{io, mem};
use libc::{pid_t, clockid_t, c_int}; use libc::{pid_t, clockid_t, c_int};
@ -197,16 +198,16 @@ impl Timer {
pub fn arm(&mut self, spec: TimerSpec) -> io::Result<TimerSpec> pub fn arm(&mut self, spec: TimerSpec) -> io::Result<TimerSpec>
{ {
let newspec = spec.to_itimerspec(); let newspec = spec.to_itimerspec();
let mut oldspec: libc::itimerspec = unsafe { mem::uninitialized() }; let mut oldspec = MaybeUninit::<libc::itimerspec>::uninit();
let rc = unsafe { let rc = unsafe {
timer_settime(self.timer, 0, &newspec, &mut oldspec) timer_settime(self.timer, 0, &newspec, &mut *oldspec.as_mut_ptr())
}; };
if rc != 0 { if rc != 0 {
return Err(io::Error::last_os_error()); return Err(io::Error::last_os_error());
} }
Ok(TimerSpec::from_itimerspec(oldspec)) Ok(TimerSpec::from_itimerspec(unsafe { oldspec.assume_init() }))
} }
} }
@ -246,9 +247,9 @@ fn do_setup_timeout_handler() -> io::Result<()> {
// .map(|_|()) // .map(|_|())
unsafe { unsafe {
let mut sa_mask: libc::sigset_t = mem::uninitialized(); let mut sa_mask = MaybeUninit::<libc::sigset_t>::uninit();
if libc::sigemptyset(&mut sa_mask) != 0 || if libc::sigemptyset(&mut *sa_mask.as_mut_ptr()) != 0 ||
libc::sigaddset(&mut sa_mask, SIGTIMEOUT.0) != 0 libc::sigaddset(&mut *sa_mask.as_mut_ptr(), SIGTIMEOUT.0) != 0
{ {
return Err(io::Error::last_os_error()); return Err(io::Error::last_os_error());
} }
@ -257,7 +258,7 @@ fn do_setup_timeout_handler() -> io::Result<()> {
sa_sigaction: sa_sigaction:
// libc::sigaction uses `usize` for the function pointer... // libc::sigaction uses `usize` for the function pointer...
sig_timeout_handler as *const extern "C" fn(i32) as usize, sig_timeout_handler as *const extern "C" fn(i32) as usize,
sa_mask, sa_mask: sa_mask.assume_init(),
sa_flags: 0, sa_flags: 0,
sa_restorer: None, sa_restorer: None,
}; };
@ -328,17 +329,21 @@ pub fn unblock_timeout_signal() -> TimeoutBlockGuard {
// passed to the kernel, or signal numbers are "invalid", since we know // passed to the kernel, or signal numbers are "invalid", since we know
// neither is the case we will panic on error... // neither is the case we will panic on error...
let was_blocked = unsafe { let was_blocked = unsafe {
let mut mask: libc::sigset_t = mem::uninitialized(); let mut mask = MaybeUninit::<libc::sigset_t>::uninit();
let mut oldset: libc::sigset_t = mem::uninitialized(); let mut oldset = MaybeUninit::<libc::sigset_t>::uninit();
if libc::sigemptyset(&mut mask) != 0 if libc::sigemptyset(&mut *mask.as_mut_ptr()) != 0
|| libc::sigaddset(&mut mask, SIGTIMEOUT.0) != 0 || libc::sigaddset(&mut *mask.as_mut_ptr(), SIGTIMEOUT.0) != 0
|| libc::pthread_sigmask(libc::SIG_UNBLOCK, &mask, &mut oldset) != 0 || libc::pthread_sigmask(
libc::SIG_UNBLOCK,
&mask.assume_init(),
&mut *oldset.as_mut_ptr(),
) != 0
{ {
panic!("Impossibly failed to unblock SIGTIMEOUT"); panic!("Impossibly failed to unblock SIGTIMEOUT");
//return Err(io::Error::last_os_error()); //return Err(io::Error::last_os_error());
} }
libc::sigismember(&oldset, SIGTIMEOUT.0) == 1 libc::sigismember(&oldset.assume_init(), SIGTIMEOUT.0) == 1
}; };
TimeoutBlockGuard(was_blocked) TimeoutBlockGuard(was_blocked)
} }
@ -350,10 +355,10 @@ pub fn block_timeout_signal() {
//set.add(SIGTIMEOUT); //set.add(SIGTIMEOUT);
//set.thread_block() //set.thread_block()
unsafe { unsafe {
let mut mask: libc::sigset_t = mem::uninitialized(); let mut mask = MaybeUninit::<libc::sigset_t>::uninit();
if libc::sigemptyset(&mut mask) != 0 if libc::sigemptyset(&mut *mask.as_mut_ptr()) != 0
|| libc::sigaddset(&mut mask, SIGTIMEOUT.0) != 0 || libc::sigaddset(&mut *mask.as_mut_ptr(), SIGTIMEOUT.0) != 0
|| libc::pthread_sigmask(libc::SIG_BLOCK, &mask, || libc::pthread_sigmask(libc::SIG_BLOCK, &mask.assume_init(),
std::ptr::null_mut()) != 0 std::ptr::null_mut()) != 0
{ {
panic!("Impossibly failed to block SIGTIMEOUT"); panic!("Impossibly failed to block SIGTIMEOUT");