Skip to content

utils/macos/epoll: Fix EV_EOF mapping #567

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
slp merged 1 commit into from
Mar 12, 2026
Merged

utils/macos/epoll: Fix EV_EOF mapping #567

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions src/utils/src/macos/epoll.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,11 @@ impl Epoll {
}
}

/// Register, modify, or remove interest in events for a file descriptor.
///
/// Note: `READ_HANG_UP` (`EPOLLRDHUP`) is ignored. kqueue always
/// reports `EV_EOF` without opt-in, so `wait()` reports
/// `READ_HANG_UP` on read EOF regardless of registration.
pub fn ctl(
&self,
operation: ControlOperation,
Expand Down Expand Up @@ -282,15 +287,14 @@ impl Epoll {
for i in 0..nevents {
if kevs[i].0.filter == libc::EVFILT_READ {
events[i].events = EventSet::IN.bits();
if kevs[i].0.flags & libc::EV_EOF != 0 {
events[i].events |= EventSet::READ_HANG_UP.bits();
}
} else if kevs[i].0.filter == libc::EVFILT_WRITE {
events[i].events = EventSet::OUT.bits();
}
if kevs[i].0.flags & libc::EV_EOF != 0 {
events[i].events |= if kevs[i].0.flags & libc::EV_CLEAR != 0 {
EventSet::READ_HANG_UP.bits()
} else {
EventSet::HANG_UP.bits()
};
if kevs[i].0.flags & libc::EV_EOF != 0 {
events[i].events |= EventSet::HANG_UP.bits();
}
}
events[i].u64 = kevs[i].udata();

Expand Down
Loading