Auto merge of #309 - alex-gulyas:update-signalfd, r=fiveop

Update signalfd

Update `signalfd` to use types and functions from `libc`.

It is a breaking change, because:
- renamed pub const `CREATE_NEW_FD` to `SIGNALFD_NEW`
- renamed pub const `SIGINFO_SIZE` to `SIGNALFD_SIGINFO_SIZE`
- removed pub const `SIGINFO_PADDING`

Fixes #307

Author: homu

src/sys/signalfd.rs

@@ -15,32 +15,25 @@
 //!
 //! Please note that signal discarding is not specific to `signalfd`, but also happens with regular
 //! signal handlers.
-use libc::{c_int, pid_t, uid_t};
+use libc;
 use unistd;
-use {Errno, Result};
-use sys::signal::signal::siginfo as signal_siginfo;
+use {Error, Errno, Result};
 pub use sys::signal::{self, SigSet};
+pub use libc::signalfd_siginfo as siginfo;
 
 use std::os::unix::io::{RawFd, AsRawFd};
 use std::mem;
 
-mod ffi {
-    use libc::c_int;
-    use sys::signal::sigset_t;
-
-    extern {
-        pub fn signalfd(fd: c_int, mask: *const sigset_t, flags: c_int) -> c_int;
-    }
-}
 
 bitflags!{
-    flags SfdFlags: c_int {
-        const SFD_NONBLOCK  = 0o00004000, // O_NONBLOCK
-        const SFD_CLOEXEC   = 0o02000000, // O_CLOEXEC
+    flags SfdFlags: libc::c_int {
+        const SFD_NONBLOCK  = libc::SFD_NONBLOCK,
+        const SFD_CLOEXEC   = libc::SFD_CLOEXEC,
     }
 }
 
-pub const CREATE_NEW_FD: RawFd = -1;
+pub const SIGNALFD_NEW: RawFd = -1;
+pub const SIGNALFD_SIGINFO_SIZE: usize = 128;
 
 /// Creates a new file descriptor for reading signals.
 ///
@@ -55,7 +48,7 @@ pub const CREATE_NEW_FD: RawFd = -1;
 /// See [the signalfd man page for more information](http://man7.org/linux/man-pages/man2/signalfd.2.html)
 pub fn signalfd(fd: RawFd, mask: &SigSet, flags: SfdFlags) -> Result<RawFd> {
     unsafe {
-        Errno::result(ffi::signalfd(fd as c_int, mask.as_ref(), flags.bits()))
+        Errno::result(libc::signalfd(fd as libc::c_int, mask.as_ref(), flags.bits()))
     }
 }
 
@@ -98,7 +91,7 @@ impl SignalFd {
     }
 
     pub fn with_flags(mask: &SigSet, flags: SfdFlags) -> Result<SignalFd> {
-        let fd = try!(signalfd(CREATE_NEW_FD, mask, flags));
+        let fd = try!(signalfd(SIGNALFD_NEW, mask, flags));
 
         Ok(SignalFd(fd))
     }
@@ -108,10 +101,10 @@ impl SignalFd {
     }
 
     pub fn read_signal(&mut self) -> Result<Option<siginfo>> {
-        let mut buffer: [u8; SIGINFO_SIZE] = unsafe { mem::uninitialized() };
+        let mut buffer: [u8; SIGNALFD_SIGINFO_SIZE] = unsafe { mem::uninitialized() };
 
         match unistd::read(self.0, &mut buffer) {
-            Ok(SIGINFO_SIZE) => Ok(Some(unsafe { mem::transmute_copy(&buffer) })),
+            Ok(SIGNALFD_SIGINFO_SIZE) => Ok(Some(unsafe { mem::transmute(buffer) })),
             Ok(_) => unreachable!("partial read on signalfd"),
             Err(Error::Sys(Errno::EAGAIN)) => Ok(None),
             Err(error) => Err(error)
@@ -143,51 +136,17 @@ impl Iterator for SignalFd {
     }
 }
 
-pub const SIGINFO_SIZE: usize = 128;
-pub const SIGINFO_PADDING: usize = 48;
-
-#[derive(Debug, Clone, PartialEq)]
-#[repr(C, packed)]
-pub struct siginfo {
-    pub ssi_signo: u32,
-    pub ssi_errno: i32,
-    pub ssi_code: i32,
-    pub ssi_pid: u32,
-    pub ssi_uid: u32,
-    pub ssi_fd: i32,
-    pub ssi_tid: u32,
-    pub ssi_band: u32,
-    pub ssi_overrun: u32,
-    pub ssi_trapno: u32,
-    pub ssi_status: i32,
-    pub ssi_int: i32,
-    pub ssi_ptr: u64,
-    pub ssi_utime: u64,
-    pub ssi_stime: u64,
-    pub ssi_addr: u64,
-}
-
-impl Into<signal_siginfo> for siginfo {
-    fn into(self) -> signal_siginfo {
-        signal_siginfo {
-            si_signo: self.ssi_signo as c_int,
-            si_errno: self.ssi_errno as c_int,
-            si_code: self.ssi_code as c_int,
-            pid: self.ssi_pid as pid_t,
-            uid: self.ssi_uid as uid_t,
-            status: self.ssi_status as c_int,
-        }
-    }
-}
 
 #[cfg(test)]
 mod tests {
     use super::*;
     use std::mem;
+    use libc;
+
 
     #[test]
     fn check_siginfo_size() {
-        assert_eq!(mem::size_of::<siginfo>() + SIGINFO_PADDING, SIGINFO_SIZE);
+        assert_eq!(mem::size_of::<libc::signalfd_siginfo>(), SIGNALFD_SIGINFO_SIZE);
     }
 
     #[test]
@@ -210,6 +169,6 @@ mod tests {
         let mut fd = SignalFd::with_flags(&mask, SFD_NONBLOCK).unwrap();
 
         let res = fd.read_signal();
-        assert_eq!(res, Ok(None));
+        assert!(res.unwrap().is_none());
     }
 }

test/test_signalfd.rs

@@ -2,11 +2,15 @@ extern crate nix;
 
 #[cfg(feature = "signalfd")]
 
-use nix::sys::signalfd::*;
+use nix::sys::signalfd::SignalFd;
+use nix::sys::signal;
+use nix::unistd;
 
 #[cfg(feature = "signalfd")]
 fn main() {
-    let mut mask = SigSet::empty();
+    print!("test test_signalfd ... ");
+
+    let mut mask = signal::SigSet::empty();
     mask.add(signal::SIGUSR1).unwrap();
     mask.thread_block().unwrap();
 
@@ -16,13 +20,9 @@ fn main() {
     signal::kill(pid, signal::SIGUSR1).unwrap();
 
     let res = fd.read_signal();
-    assert!(res.is_ok());
-
-    let opt = res.ok().unwrap();
-    assert!(opt.is_some());
 
-    let info = opt.unwrap();
-    assert_eq!(info.ssi_signo as i32, signal::SIGUSR1);
+    assert_eq!(res.unwrap().unwrap().ssi_signo as i32, signal::SIGUSR1);
+    println!("ok");
 }
 
 #[cfg(not(feature = "signalfd"))]