From 3106b3ca37e2f7c1733008b352d47fecb2a1aea3 Mon Sep 17 00:00:00 2001 From: Carl Lerche Date: Thu, 28 May 2015 12:40:27 -0700 Subject: Move nix::mq -> nix::mqueue to mirror header --- src/lib.rs | 2 +- src/mq.rs | 97 ----------------------------------------------------------- src/mqueue.rs | 97 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 98 insertions(+), 98 deletions(-) delete mode 100644 src/mq.rs create mode 100644 src/mqueue.rs (limited to 'src') diff --git a/src/lib.rs b/src/lib.rs index 37452d7e..1e510e57 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -31,7 +31,7 @@ pub mod fcntl; pub mod mount; #[cfg(any(target_os = "linux"))] -pub mod mq; +pub mod mqueue; #[cfg(any(target_os = "linux", target_os = "android"))] pub mod sched; diff --git a/src/mq.rs b/src/mq.rs deleted file mode 100644 index 63078192..00000000 --- a/src/mq.rs +++ /dev/null @@ -1,97 +0,0 @@ -use {Error, Result, from_ffi}; -use errno::Errno; - -use libc::{c_int, c_long, c_char, size_t, mode_t, strlen}; -use std::ffi::CString; -use sys::stat::Mode; - -pub use self::consts::*; - -pub type MQd = c_int; - -#[cfg(target_os = "linux")] -mod consts { - use libc::c_int; - - bitflags!( - flags MQ_OFlag: c_int { - const O_RDONLY = 0o00000000, - const O_WRONLY = 0o00000001, - const O_RDWR = 0o00000002, - const O_CREAT = 0o00000100, - const O_EXCL = 0o00000200, - const O_NONBLOCK = 0o00004000, - const O_CLOEXEC = 0o02000000, - } - ); - - bitflags!( - flags FdFlag: c_int { - const FD_CLOEXEC = 1 - } - ); -} - -mod ffi { - use libc::{c_char, size_t, ssize_t, c_uint, c_int, mode_t}; - use super::MQd; - use super::MqAttr; - - extern { - pub fn mq_open(name: *const c_char, oflag: c_int, mode: mode_t, attr: *const MqAttr) -> MQd; - - pub fn mq_close (mqdes: MQd) -> c_int; - - pub fn mq_receive (mqdes: MQd, msg_ptr: *const c_char, msg_len: size_t, msq_prio: *const c_uint) -> ssize_t; - - pub fn mq_send (mqdes: MQd, msg_ptr: *const c_char, msg_len: size_t, msq_prio: c_uint) -> c_int; - } -} - -#[repr(C)] -#[derive(Clone, Copy, Debug)] -pub struct MqAttr { - pub mq_flags: c_long, - pub mq_maxmsg: c_long, - pub mq_msgsize: c_long, - pub mq_curmsgs: c_long, -} - -#[inline] -pub fn mq_open(name: &CString, oflag: MQ_OFlag, mode: Mode, attr: &MqAttr) -> Result { - let res = unsafe { ffi::mq_open(name.as_ptr(), oflag.bits(), mode.bits() as mode_t, attr as *const MqAttr) }; - - if res < 0 { - return Err(Error::Sys(Errno::last())); - } - - Ok(res) -} - -pub fn mq_close(mqdes: MQd) -> Result<()> { - let res = unsafe { ffi::mq_close(mqdes) }; - from_ffi(res) -} - - -pub fn mq_receive(mqdes: MQd, message: &mut [u8], msq_prio: u32) -> Result { - let len = message.len() as size_t; - let res = unsafe { ffi::mq_receive(mqdes, message.as_mut_ptr() as *mut c_char, len, &msq_prio) }; - - if res < 0 { - return Err(Error::Sys(Errno::last())); - } - - Ok(res as usize) -} - -pub fn mq_send(mqdes: MQd, message: &CString, msq_prio: u32) -> Result { - let len = unsafe { strlen(message.as_ptr()) as size_t }; - let res = unsafe { ffi::mq_send(mqdes, message.as_ptr(), len, msq_prio) }; - - if res < 0 { - return Err(Error::Sys(Errno::last())); - } - - Ok(res as usize) -} diff --git a/src/mqueue.rs b/src/mqueue.rs new file mode 100644 index 00000000..63078192 --- /dev/null +++ b/src/mqueue.rs @@ -0,0 +1,97 @@ +use {Error, Result, from_ffi}; +use errno::Errno; + +use libc::{c_int, c_long, c_char, size_t, mode_t, strlen}; +use std::ffi::CString; +use sys::stat::Mode; + +pub use self::consts::*; + +pub type MQd = c_int; + +#[cfg(target_os = "linux")] +mod consts { + use libc::c_int; + + bitflags!( + flags MQ_OFlag: c_int { + const O_RDONLY = 0o00000000, + const O_WRONLY = 0o00000001, + const O_RDWR = 0o00000002, + const O_CREAT = 0o00000100, + const O_EXCL = 0o00000200, + const O_NONBLOCK = 0o00004000, + const O_CLOEXEC = 0o02000000, + } + ); + + bitflags!( + flags FdFlag: c_int { + const FD_CLOEXEC = 1 + } + ); +} + +mod ffi { + use libc::{c_char, size_t, ssize_t, c_uint, c_int, mode_t}; + use super::MQd; + use super::MqAttr; + + extern { + pub fn mq_open(name: *const c_char, oflag: c_int, mode: mode_t, attr: *const MqAttr) -> MQd; + + pub fn mq_close (mqdes: MQd) -> c_int; + + pub fn mq_receive (mqdes: MQd, msg_ptr: *const c_char, msg_len: size_t, msq_prio: *const c_uint) -> ssize_t; + + pub fn mq_send (mqdes: MQd, msg_ptr: *const c_char, msg_len: size_t, msq_prio: c_uint) -> c_int; + } +} + +#[repr(C)] +#[derive(Clone, Copy, Debug)] +pub struct MqAttr { + pub mq_flags: c_long, + pub mq_maxmsg: c_long, + pub mq_msgsize: c_long, + pub mq_curmsgs: c_long, +} + +#[inline] +pub fn mq_open(name: &CString, oflag: MQ_OFlag, mode: Mode, attr: &MqAttr) -> Result { + let res = unsafe { ffi::mq_open(name.as_ptr(), oflag.bits(), mode.bits() as mode_t, attr as *const MqAttr) }; + + if res < 0 { + return Err(Error::Sys(Errno::last())); + } + + Ok(res) +} + +pub fn mq_close(mqdes: MQd) -> Result<()> { + let res = unsafe { ffi::mq_close(mqdes) }; + from_ffi(res) +} + + +pub fn mq_receive(mqdes: MQd, message: &mut [u8], msq_prio: u32) -> Result { + let len = message.len() as size_t; + let res = unsafe { ffi::mq_receive(mqdes, message.as_mut_ptr() as *mut c_char, len, &msq_prio) }; + + if res < 0 { + return Err(Error::Sys(Errno::last())); + } + + Ok(res as usize) +} + +pub fn mq_send(mqdes: MQd, message: &CString, msq_prio: u32) -> Result { + let len = unsafe { strlen(message.as_ptr()) as size_t }; + let res = unsafe { ffi::mq_send(mqdes, message.as_ptr(), len, msq_prio) }; + + if res < 0 { + return Err(Error::Sys(Errno::last())); + } + + Ok(res as usize) +} -- cgit v1.2.3