Use libc constants for signals.

Author: fiveop

src/sys/signal.rs

@@ -8,20 +8,17 @@ use std::ptr;
 use {Error, Result};
 
 pub use libc::{
-    SIGHUP,   // 1
-    SIGINT,   // 2
-    SIGQUIT,  // 3
-    SIGILL,   // 4
-    SIGABRT,  // 6
-    SIGFPE,   // 8
-    SIGKILL,  // 9
-    SIGSEGV,  // 11
-    SIGPIPE,  // 13
-    SIGALRM,  // 14
-    SIGTERM,  // 15
-};
-
-pub use self::signal::{
+    SIGHUP,
+    SIGINT,
+    SIGQUIT,
+    SIGILL,
+    SIGABRT,
+    SIGFPE,
+    SIGKILL,
+    SIGSEGV,
+    SIGPIPE,
+    SIGALRM,
+    SIGTERM,
     SIGTRAP,
     SIGIOT,
     SIGBUS,
@@ -41,10 +38,13 @@ pub use self::signal::{
     SIGWINCH,
     SIGUSR1,
     SIGUSR2,
-
-    NSIG,
 };
 
+// This doesn't always exist, but when it does, it's 7
+pub const SIGEMT: libc::c_int = 7;
+
+pub const NSIG: libc::c_int = 32;
+
 pub use self::signal::{
     SockFlag,
 
@@ -60,9 +60,6 @@ pub use self::signal::{
 pub use self::signal::{HowFlag, SIG_BLOCK, SIG_UNBLOCK, SIG_SETMASK};
 pub use self::signal::sigset_t;
 
-// This doesn't always exist, but when it does, it's 7
-pub const SIGEMT: libc::c_int = 7;
-
 #[cfg(any(all(target_os = "linux",
               any(target_arch = "x86",
                   target_arch = "x86_64",
@@ -92,32 +89,6 @@ pub mod signal {
         }
     }
 
-    pub const SIGTRAP:      libc::c_int = 5;
-    pub const SIGIOT:       libc::c_int = 6;
-    pub const SIGBUS:       libc::c_int = 7;
-    pub const SIGUSR1:      libc::c_int = 10;
-    pub const SIGUSR2:      libc::c_int = 12;
-    pub const SIGSTKFLT:    libc::c_int = 16;
-    pub const SIGCHLD:      libc::c_int = 17;
-    pub const SIGCONT:      libc::c_int = 18;
-    pub const SIGSTOP:      libc::c_int = 19;
-    pub const SIGTSTP:      libc::c_int = 20;
-    pub const SIGTTIN:      libc::c_int = 21;
-    pub const SIGTTOU:      libc::c_int = 22;
-    pub const SIGURG:       libc::c_int = 23;
-    pub const SIGXCPU:      libc::c_int = 24;
-    pub const SIGXFSZ:      libc::c_int = 25;
-    pub const SIGVTALRM:    libc::c_int = 26;
-    pub const SIGPROF:      libc::c_int = 27;
-    pub const SIGWINCH:     libc::c_int = 28;
-    pub const SIGIO:        libc::c_int = 29;
-    pub const SIGPOLL:      libc::c_int = 29;
-    pub const SIGPWR:       libc::c_int = 30;
-    pub const SIGSYS:       libc::c_int = 31;
-    pub const SIGUNUSED:    libc::c_int = 31;
-
-    pub const NSIG:         libc::c_int = 32;
-
     // This definition is not as accurate as it could be, {pid, uid, status} is
     // actually a giant union. Currently we're only interested in these fields,
     // however.
@@ -181,31 +152,6 @@ pub mod signal {
         }
     }
 
-    pub const SIGTRAP:      libc::c_int = 5;
-    pub const SIGIOT:       libc::c_int = 6;
-    pub const SIGBUS:       libc::c_int = 10;
-    pub const SIGSYS:       libc::c_int = 12;
-    pub const SIGUSR1:      libc::c_int = 16;
-    pub const SIGUSR2:      libc::c_int = 17;
-    pub const SIGCHLD:      libc::c_int = 18;
-    pub const SIGCLD:       libc::c_int = 18;
-    pub const SIGPWR:       libc::c_int = 19;
-    pub const SIGWINCH:     libc::c_int = 20;
-    pub const SIGURG:       libc::c_int = 21;
-    pub const SIGIO:        libc::c_int = 22;
-    pub const SIGPOLL:      libc::c_int = 22;
-    pub const SIGSTOP:      libc::c_int = 23;
-    pub const SIGTSTP:      libc::c_int = 24;
-    pub const SIGCONT:      libc::c_int = 25;
-    pub const SIGTTIN:      libc::c_int = 26;
-    pub const SIGTTOU:      libc::c_int = 27;
-    pub const SIGVTALRM:    libc::c_int = 28;
-    pub const SIGPROF:      libc::c_int = 29;
-    pub const SIGXCPU:      libc::c_int = 30;
-    pub const SIGFSZ:       libc::c_int = 31;
-
-    pub const NSIG:         libc::c_int = 32;
-
     // This definition is not as accurate as it could be, {pid, uid, status} is
     // actually a giant union. Currently we're only interested in these fields,
     // however.
@@ -263,29 +209,6 @@ pub mod signal {
         }
     }
 
-    pub const SIGTRAP:      libc::c_int = 5;
-    pub const SIGIOT:       libc::c_int = 6;
-    pub const SIGBUS:       libc::c_int = 10;
-    pub const SIGSYS:       libc::c_int = 12;
-    pub const SIGURG:       libc::c_int = 16;
-    pub const SIGSTOP:      libc::c_int = 17;
-    pub const SIGTSTP:      libc::c_int = 18;
-    pub const SIGCONT:      libc::c_int = 19;
-    pub const SIGCHLD:      libc::c_int = 20;
-    pub const SIGTTIN:      libc::c_int = 21;
-    pub const SIGTTOU:      libc::c_int = 22;
-    pub const SIGIO:        libc::c_int = 23;
-    pub const SIGXCPU:      libc::c_int = 24;
-    pub const SIGXFSZ:      libc::c_int = 25;
-    pub const SIGVTALRM:    libc::c_int = 26;
-    pub const SIGPROF:      libc::c_int = 27;
-    pub const SIGWINCH:     libc::c_int = 28;
-    pub const SIGINFO:      libc::c_int = 29;
-    pub const SIGUSR1:      libc::c_int = 30;
-    pub const SIGUSR2:      libc::c_int = 31;
-
-    pub const NSIG:         libc::c_int = 32;
-
     #[cfg(any(target_os = "macos", target_os = "ios", target_os = "openbsd"))]
     pub type sigset_t = u32;
     #[cfg(target_os = "freebsd")]
@@ -559,38 +482,38 @@ mod tests {
     #[test]
     fn test_contains() {
         let mut mask = SigSet::empty();
-        mask.add(signal::SIGUSR1).unwrap();
+        mask.add(SIGUSR1).unwrap();
 
-        assert_eq!(mask.contains(signal::SIGUSR1), Ok(true));
-        assert_eq!(mask.contains(signal::SIGUSR2), Ok(false));
+        assert_eq!(mask.contains(SIGUSR1), Ok(true));
+        assert_eq!(mask.contains(SIGUSR2), Ok(false));
 
         let all = SigSet::all();
-        assert_eq!(all.contains(signal::SIGUSR1), Ok(true));
-        assert_eq!(all.contains(signal::SIGUSR2), Ok(true));
+        assert_eq!(all.contains(SIGUSR1), Ok(true));
+        assert_eq!(all.contains(SIGUSR2), Ok(true));
     }
 
     #[test]
     fn test_thread_signal_block() {
         let mut mask = SigSet::empty();
-        mask.add(signal::SIGUSR1).unwrap();
+        mask.add(SIGUSR1).unwrap();
 
         assert!(mask.thread_block().is_ok());
     }
 
     #[test]
     fn test_thread_signal_swap() {
         let mut mask = SigSet::empty();
-        mask.add(signal::SIGUSR1).unwrap();
+        mask.add(SIGUSR1).unwrap();
         mask.thread_block().unwrap();
 
         assert!(SigSet::thread_get_mask().unwrap().contains(SIGUSR1).unwrap());
 
         let mask2 = SigSet::empty();
-        mask.add(signal::SIGUSR2).unwrap();
+        mask.add(SIGUSR2).unwrap();
 
         let oldmask = mask2.thread_swap_mask(signal::SIG_SETMASK).unwrap();
 
-        assert!(oldmask.contains(signal::SIGUSR1).unwrap());
-        assert!(!oldmask.contains(signal::SIGUSR2).unwrap());
+        assert!(oldmask.contains(SIGUSR1).unwrap());
+        assert!(!oldmask.contains(SIGUSR2).unwrap());
     }
 }