Verified Commit f8fe67e7 authored by Jeremy Soller's avatar Jeremy Soller

Merge remote-tracking branch 'origin/epoll'

parents 10fdea88 89b4fa80
Pipeline #4009 failed with stages
in 11 minutes and 18 seconds
......@@ -54,6 +54,7 @@ pub fn poll_epoll(fds: &mut [pollfd], timeout: c_int) -> c_int {
data: epoll_data {
u64: i as u64,
},
..Default::default()
};
for (p, ep) in event_map.iter() {
......
......@@ -82,6 +82,7 @@ pub fn select_epoll(
data: epoll_data {
fd: fd,
},
..Default::default()
};
if epoll_ctl(*ep, EPOLL_CTL_ADD, fd, &mut event) < 0 {
if unsafe { platform::errno == errno::EPERM } {
......@@ -101,6 +102,7 @@ pub fn select_epoll(
data: epoll_data {
fd: fd,
},
..Default::default()
};
if epoll_ctl(*ep, EPOLL_CTL_ADD, fd, &mut event) < 0 {
if unsafe { platform::errno == errno::EPERM } {
......@@ -120,6 +122,7 @@ pub fn select_epoll(
data: epoll_data {
fd: fd,
},
..Default::default()
};
if epoll_ctl(*ep, EPOLL_CTL_ADD, fd, &mut event) < 0 {
if unsafe { platform::errno == errno::EPERM } {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment