rust
/
smol
mirror of https://github.com/stjepang/smol
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #124 from polachok/eventfd-close 

fix: add Drop for eventfd
This commit is contained in:
Stjepan Glavina 2020-05-20 12:35:59 -07:00 committed by GitHub
parent 009db3a5c0 efcb9e7e40
commit 914f3b2d17
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/io_event.rs
View File

@ -115,7 +115,6 @@ mod linux {
use nix::sys::eventfd::{eventfd, EfdFlags};
use std::os::unix::io::AsRawFd;
#[derive(Clone)]
pub(crate) struct EventFd(std::os::unix::io::RawFd);
impl EventFd {
@ -123,6 +122,10 @@ mod linux {
let fd = eventfd(0, EfdFlags::EFD_CLOEXEC | EfdFlags::EFD_NONBLOCK).map_err(io_err)?;
Ok(EventFd(fd))
}
pub fn try_clone(&self) -> Result<EventFd, io::Error> {
nix::unistd::dup(self.0).map(EventFd).map_err(io_err)
}
}
impl AsRawFd for EventFd {
@ -131,6 +134,12 @@ mod linux {
}
}
impl Drop for EventFd {
fn drop(&mut self) {
let _ = nix::unistd::close(self.0);
}
}
fn io_err(err: nix::Error) -> io::Error {
match err {
nix::Error::Sys(code) => code.into(),
@ -163,7 +172,7 @@ mod linux {
fn notifier() -> io::Result<(Notifier, Notifier)> {
use linux::EventFd;
let sock1 = EventFd::new()?;
let sock2 = sock1.clone();
let sock2 = sock1.try_clone()?;
Ok((sock1, sock2))
}