Skip to content
Snippets Groups Projects
Commit ba433201 authored by Ron Williams's avatar Ron Williams
Browse files

epoll: correct error when skipping time events

parent c75a6e64
No related branches found
No related tags found
1 merge request!416epoll: correct error when skipping time events
...@@ -116,6 +116,7 @@ impl PalEpoll for Sys { ...@@ -116,6 +116,7 @@ impl PalEpoll for Sys {
for i in 0..read { for i in 0..read {
unsafe { unsafe {
let event_ptr = events.add(i); let event_ptr = events.add(i);
let target_ptr = events.add(count);
let event = *(event_ptr as *mut Event); let event = *(event_ptr as *mut Event);
if let Some(ref timer) = timer_opt { if let Some(ref timer) = timer_opt {
if event.id as c_int == timer.fd { if event.id as c_int == timer.fd {
...@@ -123,7 +124,7 @@ impl PalEpoll for Sys { ...@@ -123,7 +124,7 @@ impl PalEpoll for Sys {
continue; continue;
} }
} }
*event_ptr = epoll_event { *target_ptr = epoll_event {
events: event.flags.bits() as _, events: event.flags.bits() as _,
data: epoll_data { data: epoll_data {
u64: event.data as u64, u64: event.data as u64,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment