-
Notifications
You must be signed in to change notification settings - Fork 67
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
haiku support #154
Merged
Merged
haiku support #154
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
c1919c4
use pipe instead of pipe2 for haiku
hoanga 537daac
formatting update
hoanga 2897b72
fix typo
hoanga 560abda
add ci check for haiku
hoanga bcb4aa6
consolidate haiku and non-esp notifier
hoanga c6423eb
address ci
hoanga 6993bf4
reduce pipe creation duplicates
hoanga fb1b0cc
address ci
hoanga b150d3d
make fallback_pipe handle more
hoanga File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change | ||||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
@@ -446,8 +446,14 @@ mod notify { | |||||||||||||||||
use rustix::event::PollFlags; | ||||||||||||||||||
use rustix::fd::{AsFd, AsRawFd, BorrowedFd, OwnedFd, RawFd}; | ||||||||||||||||||
use rustix::fs::{fcntl_getfl, fcntl_setfl, OFlags}; | ||||||||||||||||||
use rustix::io::{fcntl_getfd, fcntl_setfd, read, write, FdFlags}; | ||||||||||||||||||
use rustix::pipe::{pipe, pipe_with, PipeFlags}; | ||||||||||||||||||
#[cfg(target_os = "haiku")] | ||||||||||||||||||
use rustix::io::{fcntl_getfd, fcntl_setfd, FdFlags}; | ||||||||||||||||||
use rustix::io::{read, write}; | ||||||||||||||||||
#[cfg(target_os = "haiku")] | ||||||||||||||||||
use rustix::pipe::pipe; | ||||||||||||||||||
#[cfg(not(target_os = "haiku"))] | ||||||||||||||||||
use rustix::pipe::pipe_with; | ||||||||||||||||||
use rustix::pipe::PipeFlags; | ||||||||||||||||||
|
||||||||||||||||||
/// A notification pipe. | ||||||||||||||||||
/// | ||||||||||||||||||
|
@@ -468,12 +474,18 @@ mod notify { | |||||||||||||||||
impl Notify { | ||||||||||||||||||
/// Creates a new notification pipe. | ||||||||||||||||||
pub(super) fn new() -> io::Result<Self> { | ||||||||||||||||||
let (read_pipe, write_pipe) = pipe_with(PipeFlags::CLOEXEC).or_else(|_| { | ||||||||||||||||||
#[cfg(not(target_os = "haiku"))] | ||||||||||||||||||
let pipe_init = pipe_with; | ||||||||||||||||||
|
||||||||||||||||||
#[cfg(target_os = "haiku")] | ||||||||||||||||||
let pipe_init = |_| { | ||||||||||||||||||
let (read_pipe, write_pipe) = pipe()?; | ||||||||||||||||||
fcntl_setfd(&read_pipe, fcntl_getfd(&read_pipe)? | FdFlags::CLOEXEC)?; | ||||||||||||||||||
fcntl_setfd(&write_pipe, fcntl_getfd(&write_pipe)? | FdFlags::CLOEXEC)?; | ||||||||||||||||||
io::Result::Ok((read_pipe, write_pipe)) | ||||||||||||||||||
})?; | ||||||||||||||||||
}; | ||||||||||||||||||
|
||||||||||||||||||
let (read_pipe, write_pipe) = pipe_init(PipeFlags::CLOEXEC)?; | ||||||||||||||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. updated per suggestions |
||||||||||||||||||
|
||||||||||||||||||
// Put the reading side into non-blocking mode. | ||||||||||||||||||
fcntl_setfl(&read_pipe, fcntl_getfl(&read_pipe)? | OFlags::NONBLOCK)?; | ||||||||||||||||||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.