From bff660f1ed579b39f70f07a228f9135686242c6b Mon Sep 17 00:00:00 2001 From: qupeng Date: Thu, 8 Dec 2016 19:50:49 +0800 Subject: [PATCH 1/7] fix #480 and add simple test cases for that. r? @fiveop --- src/sys/epoll.rs | 18 +++++++++++++++--- test/sys/mod.rs | 1 + test/sys/test_epoll.rs | 20 ++++++++++++++++++++ 3 files changed, 36 insertions(+), 3 deletions(-) create mode 100644 test/sys/test_epoll.rs diff --git a/src/sys/epoll.rs b/src/sys/epoll.rs index 9774318f46..3c68b49f62 100644 --- a/src/sys/epoll.rs +++ b/src/sys/epoll.rs @@ -1,6 +1,7 @@ use {Errno, Result}; use libc::{self, c_int}; use std::os::unix::io::RawFd; +use std::ptr; bitflags!( #[repr(C)] @@ -57,6 +58,16 @@ impl EpollEvent { } } +impl<'a> Into<&'a mut EpollEvent> for Option<&'a mut EpollEvent> { + #[inline] + fn into(self) -> &'a mut EpollEvent { + match self { + Some(epoll_event) => epoll_event, + None => unsafe { &mut *ptr::null_mut::() } + } + } +} + #[inline] pub fn epoll_create() -> Result { let res = unsafe { libc::epoll_create(1024) }; @@ -72,9 +83,10 @@ pub fn epoll_create1(flags: EpollCreateFlags) -> Result { } #[inline] -pub fn epoll_ctl(epfd: RawFd, op: EpollOp, fd: RawFd, event: &mut EpollEvent) -> Result<()> { - let res = unsafe { libc::epoll_ctl(epfd, op as c_int, fd, &mut event.event) }; - +pub fn epoll_ctl<'a, T>(epfd: RawFd, op: EpollOp, fd: RawFd, event: T) -> Result<()> + where T: Into<&'a mut EpollEvent> +{ + let res = unsafe { libc::epoll_ctl(epfd, op as c_int, fd, &mut event.into().event) }; Errno::result(res).map(drop) } diff --git a/test/sys/mod.rs b/test/sys/mod.rs index 6176eb323c..b073ccf739 100644 --- a/test/sys/mod.rs +++ b/test/sys/mod.rs @@ -6,3 +6,4 @@ mod test_ioctl; mod test_wait; mod test_select; mod test_uio; +mod test_epoll; diff --git a/test/sys/test_epoll.rs b/test/sys/test_epoll.rs new file mode 100644 index 0000000000..965c7d062e --- /dev/null +++ b/test/sys/test_epoll.rs @@ -0,0 +1,20 @@ +use nix::sys::epoll::{EpollCreateFlags, EpollFlags, EpollOp, EpollEvent}; +use nix::sys::epoll::{EPOLLIN, EPOLLERR}; +use nix::sys::epoll::{epoll_create1, epoll_ctl}; +use nix::{Error, Errno}; + +#[test] +pub fn test_epoll_errno() { + let efd = epoll_create1(EpollCreateFlags::empty()).unwrap(); + let result = epoll_ctl(efd, EpollOp::EpollCtlDel, 1, None); + assert!(result.is_err()); + assert_eq!(result.unwrap_err(), Error::Sys(Errno::ENOENT)); +} + +#[test] +pub fn test_epoll_ctl() { + let efd = epoll_create1(EpollCreateFlags::empty()).unwrap(); + let mut event = EpollEvent::new(EPOLLIN | EPOLLERR, 1); + epoll_ctl(efd, EpollOp::EpollCtlAdd, 1, &mut event).unwrap(); + epoll_ctl(efd, EpollOp::EpollCtlDel, 1, None).unwrap(); +} From 13ea01a97ebfecd2ab9fb2da25ff5be1b040240b Mon Sep 17 00:00:00 2001 From: qupeng Date: Sat, 10 Dec 2016 23:20:54 +0800 Subject: [PATCH 2/7] add empty() in EpollEvent. --- src/sys/epoll.rs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/sys/epoll.rs b/src/sys/epoll.rs index 3c68b49f62..885d44f225 100644 --- a/src/sys/epoll.rs +++ b/src/sys/epoll.rs @@ -45,10 +45,14 @@ pub struct EpollEvent { } impl EpollEvent { - pub fn new(events: EpollFlags, data: u64) -> EpollEvent { + pub fn new(events: EpollFlags, data: u64) -> Self { EpollEvent { event: libc::epoll_event { events: events.bits(), u64: data } } } + pub empty() -> Self { + EpollEvent::new(EpollFlags::from_bits(0), 0); + } + pub fn events(&self) -> EpollFlags { EpollFlags::from_bits(self.event.events).unwrap() } From 4dba21764c0598bdbb8165fa8b2e046f03cdcbb4 Mon Sep 17 00:00:00 2001 From: qupeng Date: Sat, 10 Dec 2016 23:30:22 +0800 Subject: [PATCH 3/7] fix EpollEvent::empty() --- src/sys/epoll.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/sys/epoll.rs b/src/sys/epoll.rs index 885d44f225..41e5d1917a 100644 --- a/src/sys/epoll.rs +++ b/src/sys/epoll.rs @@ -49,8 +49,8 @@ impl EpollEvent { EpollEvent { event: libc::epoll_event { events: events.bits(), u64: data } } } - pub empty() -> Self { - EpollEvent::new(EpollFlags::from_bits(0), 0); + pub fn empty() -> Self { + EpollEvent::new(EpollFlags::empty(), 0) } pub fn events(&self) -> EpollFlags { From ce1e93ef2f3a9d8c411f4a75aa16906e9be82ba7 Mon Sep 17 00:00:00 2001 From: qupeng Date: Sun, 11 Dec 2016 18:04:02 +0800 Subject: [PATCH 4/7] test/mod.rs: only test epoll on linux. --- test/sys/mod.rs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/sys/mod.rs b/test/sys/mod.rs index b073ccf739..d2c38c3ed4 100644 --- a/test/sys/mod.rs +++ b/test/sys/mod.rs @@ -6,4 +6,6 @@ mod test_ioctl; mod test_wait; mod test_select; mod test_uio; + +#[cfg(target_os = "linux")] mod test_epoll; From 8f170ce0c877fd0659e9c2dbad8a6e0eecb984d1 Mon Sep 17 00:00:00 2001 From: qupeng Date: Mon, 12 Dec 2016 14:02:52 +0800 Subject: [PATCH 5/7] epoll: improve EpollEvent::empty() by using mem::uninitialized. --- src/sys/epoll.rs | 3 ++- test/sys/test_epoll.rs | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/sys/epoll.rs b/src/sys/epoll.rs index 41e5d1917a..0fbc9f2c5b 100644 --- a/src/sys/epoll.rs +++ b/src/sys/epoll.rs @@ -2,6 +2,7 @@ use {Errno, Result}; use libc::{self, c_int}; use std::os::unix::io::RawFd; use std::ptr; +use std::mem; bitflags!( #[repr(C)] @@ -50,7 +51,7 @@ impl EpollEvent { } pub fn empty() -> Self { - EpollEvent::new(EpollFlags::empty(), 0) + unsafe { mem::uninitialized::() } } pub fn events(&self) -> EpollFlags { diff --git a/test/sys/test_epoll.rs b/test/sys/test_epoll.rs index 965c7d062e..f31d874f80 100644 --- a/test/sys/test_epoll.rs +++ b/test/sys/test_epoll.rs @@ -1,4 +1,4 @@ -use nix::sys::epoll::{EpollCreateFlags, EpollFlags, EpollOp, EpollEvent}; +use nix::sys::epoll::{EpollCreateFlags, EpollOp, EpollEvent}; use nix::sys::epoll::{EPOLLIN, EPOLLERR}; use nix::sys::epoll::{epoll_create1, epoll_ctl}; use nix::{Error, Errno}; From d2aba7b253ce4a9e4d67bfd6665e8bf5e59eb0f1 Mon Sep 17 00:00:00 2001 From: qupeng Date: Mon, 12 Dec 2016 19:20:27 +0800 Subject: [PATCH 6/7] EpollEvent::empty(): using mem::zeroed instead of mem::uninitialized. --- src/sys/epoll.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sys/epoll.rs b/src/sys/epoll.rs index 0fbc9f2c5b..1f2054a112 100644 --- a/src/sys/epoll.rs +++ b/src/sys/epoll.rs @@ -51,7 +51,7 @@ impl EpollEvent { } pub fn empty() -> Self { - unsafe { mem::uninitialized::() } + unsafe { mem::zeroed::() } } pub fn events(&self) -> EpollFlags { From acc15131bf445807025aa8d32b1aa925405705e2 Mon Sep 17 00:00:00 2001 From: qupeng Date: Mon, 19 Dec 2016 15:54:59 +0800 Subject: [PATCH 7/7] fix all and update CHANGELOG.md --- CHANGELOG.md | 3 +++ src/sys/epoll.rs | 12 +++++++++--- test/sys/test_epoll.rs | 4 ++++ 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6ff9cf7afe..43f33569fb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -30,6 +30,9 @@ This project adheres to [Semantic Versioning](http://semver.org/). ([#491](https://github.com/nix-rust/nix/pull/491)) ### Changed +- `epoll_ctl` now could accept None as argument `event` + when op is `EpollOp::EpollCtlDel`. + ([#480](https://github.com/nix-rust/nix/pull/480)) - Removed the `bad` keyword from the `ioctl!` macro ([#478](https://github.com/nix-rust/nix/pull/478)) - Changed `TimeVal` into an opaque Newtype diff --git a/src/sys/epoll.rs b/src/sys/epoll.rs index 1f2054a112..eb28ffb9e1 100644 --- a/src/sys/epoll.rs +++ b/src/sys/epoll.rs @@ -3,6 +3,7 @@ use libc::{self, c_int}; use std::os::unix::io::RawFd; use std::ptr; use std::mem; +use ::Error; bitflags!( #[repr(C)] @@ -25,7 +26,7 @@ bitflags!( } ); -#[derive(Clone, Copy)] +#[derive(Clone, Copy, Eq, PartialEq)] #[repr(C)] pub enum EpollOp { EpollCtlAdd = 1, @@ -91,8 +92,13 @@ pub fn epoll_create1(flags: EpollCreateFlags) -> Result { pub fn epoll_ctl<'a, T>(epfd: RawFd, op: EpollOp, fd: RawFd, event: T) -> Result<()> where T: Into<&'a mut EpollEvent> { - let res = unsafe { libc::epoll_ctl(epfd, op as c_int, fd, &mut event.into().event) }; - Errno::result(res).map(drop) + let event: &mut EpollEvent = event.into(); + if event as *const EpollEvent == ptr::null() && op != EpollOp::EpollCtlDel { + Err(Error::Sys(Errno::EINVAL)) + } else { + let res = unsafe { libc::epoll_ctl(epfd, op as c_int, fd, &mut event.event) }; + Errno::result(res).map(drop) + } } #[inline] diff --git a/test/sys/test_epoll.rs b/test/sys/test_epoll.rs index f31d874f80..a73fea6d80 100644 --- a/test/sys/test_epoll.rs +++ b/test/sys/test_epoll.rs @@ -9,6 +9,10 @@ pub fn test_epoll_errno() { let result = epoll_ctl(efd, EpollOp::EpollCtlDel, 1, None); assert!(result.is_err()); assert_eq!(result.unwrap_err(), Error::Sys(Errno::ENOENT)); + + let result = epoll_ctl(efd, EpollOp::EpollCtlAdd, 1, None); + assert!(result.is_err()); + assert_eq!(result.unwrap_err(), Error::Sys(Errno::EINVAL)); } #[test]