Skip to content
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.

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

Illumos: Added epoll and eventfd #4136

Merged
merged 2 commits into from
Jan 14, 2025

Conversation

YohDeadfall
Copy link
Contributor

Fixes #4017.

@rustbot

This comment has been minimized.

@rustbot rustbot added the S-waiting-on-author Status: Waiting for the PR author to address review comments label Jan 13, 2025
let fd = unsafe { libc::syscall(libc::SYS_eventfd2, initval, flags) };
assert_ne!(fd, -1);
cfg_if::cfg_if! {
if #[cfg(target_os = "illumos")] {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please add the #[cfg] to the function instead.

@RalfJung
Copy link
Member

Good catch!

@YohDeadfall YohDeadfall force-pushed the illumos-epoll-eventfd branch from 9016eba to 26ffab4 Compare January 13, 2025 10:07
@@ -1,7 +1,7 @@
//@compile-flags: -Zmiri-preemption-rate=0
//~^ERROR: deadlocked
//~^^ERROR: deadlocked
//@only-target: linux
//@only-target: linux illumos
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't this include android as well?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, it should.

@YohDeadfall YohDeadfall force-pushed the illumos-epoll-eventfd branch from 4ed3319 to b6523c0 Compare January 13, 2025 19:04
@RalfJung
Copy link
Member

RalfJung commented Jan 14, 2025

When updating a PR, please either do a force push or add a new commit. (Generally new commits are preferred, but for small changes to an almost-done PR like this, a force push is okay.) If you first add a new commit and the force-push that away, Github makes it entirely impossible for me to see the diff since my last review. That's clearly a sign of Github being a terrible tool for PR review, but we have to live with the tools we have and work around their limitations...

@RalfJung RalfJung added this pull request to the merge queue Jan 14, 2025
Merged via the queue into rust-lang:master with commit bd2fb62 Jan 14, 2025
7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-author Status: Waiting for the PR author to address review comments
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Illumos: Add support for epoll and eventfd
3 participants