diff options
| -rw-r--r-- | src/linux.rs | 10 | ||||
| -rw-r--r-- | sys_util/src/signal.rs | 27 |
2 files changed, 24 insertions, 13 deletions
diff --git a/src/linux.rs b/src/linux.rs index 5133a7c..f6af012 100644 --- a/src/linux.rs +++ b/src/linux.rs @@ -44,10 +44,10 @@ use sys_util::net::{UnixSeqpacket, UnixSeqpacketListener, UnlinkUnixSeqpacketLis use sys_util::{ self, block_signal, clear_signal, drop_capabilities, error, flock, get_blocked_signals, - get_group_id, get_user_id, getegid, geteuid, info, register_signal_handler, set_cpu_affinity, - validate_raw_fd, warn, EventFd, FlockOperation, GuestAddress, GuestMemory, Killable, - MemoryMapping, PollContext, PollToken, Protection, SignalFd, Terminal, TimerFd, WatchingEvents, - SIGRTMIN, + get_group_id, get_user_id, getegid, geteuid, info, register_rt_signal_handler, + set_cpu_affinity, validate_raw_fd, warn, EventFd, FlockOperation, GuestAddress, GuestMemory, + Killable, MemoryMapping, PollContext, PollToken, Protection, SignalFd, Terminal, TimerFd, + WatchingEvents, SIGRTMIN, }; use vhost; use vm_control::{ @@ -1085,7 +1085,7 @@ fn setup_vcpu_signal_handler() -> Result<()> { unsafe { extern "C" fn handle_signal() {} // Our signal handler does nothing and is trivially async signal safe. - register_signal_handler(SIGRTMIN() + 0, handle_signal) + register_rt_signal_handler(SIGRTMIN() + 0, handle_signal) .map_err(Error::RegisterSignalHandler)?; } block_signal(SIGRTMIN() + 0).map_err(Error::BlockSignal)?; diff --git a/sys_util/src/signal.rs b/sys_util/src/signal.rs index 821f0f6..fee0a99 100644 --- a/sys_util/src/signal.rs +++ b/sys_util/src/signal.rs @@ -90,21 +90,15 @@ pub fn SIGRTMAX() -> c_int { unsafe { __libc_current_sigrtmax() } } -fn valid_signal_num(num: c_int) -> bool { +fn valid_rt_signal_num(num: c_int) -> bool { num >= SIGRTMIN() && num <= SIGRTMAX() } /// Registers `handler` as the signal handler of signum `num`. /// -/// The value of `num` must be within [`SIGRTMIN`, `SIGRTMAX`] range. -/// /// This is considered unsafe because the given handler will be called asynchronously, interrupting /// whatever the thread was doing and therefore must only do async-signal-safe operations. pub unsafe fn register_signal_handler(num: c_int, handler: extern "C" fn()) -> errno::Result<()> { - if !valid_signal_num(num) { - return Err(errno::Error::new(EINVAL)); - } - let mut sigact: sigaction = mem::zeroed(); sigact.sa_flags = SA_RESTART; sigact.sa_sigaction = handler as *const () as usize; @@ -117,6 +111,23 @@ pub unsafe fn register_signal_handler(num: c_int, handler: extern "C" fn()) -> e Ok(()) } +/// Registers `handler` as the signal handler for the real-time signal with signum `num`. +/// +/// The value of `num` must be within [`SIGRTMIN`, `SIGRTMAX`] range. +/// +/// This is considered unsafe because the given handler will be called asynchronously, interrupting +/// whatever the thread was doing and therefore must only do async-signal-safe operations. +pub unsafe fn register_rt_signal_handler( + num: c_int, + handler: extern "C" fn(), +) -> errno::Result<()> { + if !valid_rt_signal_num(num) { + return Err(errno::Error::new(EINVAL)); + } + + register_signal_handler(num, handler) +} + /// Creates `sigset` from an array of signal numbers. /// /// This is a helper function used when we want to manipulate signals. @@ -260,7 +271,7 @@ pub unsafe trait Killable { /// /// The value of `num` must be within [`SIGRTMIN`, `SIGRTMAX`] range. fn kill(&self, num: c_int) -> errno::Result<()> { - if !valid_signal_num(num) { + if !valid_rt_signal_num(num) { return Err(errno::Error::new(EINVAL)); } |