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.

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

Jump to bottom

feature(process): Use pidfd on Linux for tokio::process::Child::wait #6152

Merged
merged 17 commits into from
Jan 11, 2024
Merged

feature(process): Use pidfd on Linux for tokio::process::Child::wait #6152

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
d3b6551
feat(process) pidfd: Implement initial `PidfdReaper` impl
NobodyXu Nov 13, 2023
106d9c8
Use `PidfdReaper` in `unix::Child` if possible
NobodyXu Nov 14, 2023
a3945d0
Fix compilation on non-linux targets
NobodyXu Nov 14, 2023
c6a869f
Add testing for `pidfd_reaper`
NobodyXu Nov 15, 2023
5f62be6
Fix running tests in `pidfd_reaper`
NobodyXu Nov 15, 2023
92bef5a
Disable `pidfd_reaper` test for miri
NobodyXu Nov 15, 2023
80a1cd7
Skip pidfd testing on unsupported linux kernel
NobodyXu Nov 15, 2023
c38faca
Optimization: Skip `pidfd_open` if last call failed with `ENOSYS`
NobodyXu Nov 15, 2023
3b89981
Fix `PidfdReaper::drop`: do not spawn any task there
NobodyXu Nov 27, 2023
bf14726
Only pull in `PidfdReaper` if feature rt is enabled on Linux
NobodyXu Jan 9, 2024
523117a
Add test `process_spawned_outside_runtime`
NobodyXu Jan 9, 2024
66a2f4e
Add `process_spawned_and_wait_in_different_runtime`
NobodyXu Jan 9, 2024
ef05617
Fix process_spawned_and_wait_in_different_runtime on linux with pidfd
NobodyXu Jan 10, 2024
e89a5ec
Improve safety comments in `Pidfd::open`
NobodyXu Jan 10, 2024
f093c44
Refactor `<PidfdReaperInner as Future>::poll`
NobodyXu Jan 10, 2024
7ee4509
Refactor: Mv `process_spawned_*` into `process_change_of_runtime.rs`
NobodyXu Jan 10, 2024
dc889e3
Fix leaked `sleep` process in `test_pidfd_reaper_drop`
NobodyXu Jan 11, 2024
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
Prev Previous commit
Next Next commit
Fix compilation on non-linux targets 
Signed-off-by: Jiahao XU <[email protected]>
  • Loading branch information
@NobodyXu
NobodyXu committed Dec 31, 2023
commit a3945d08e83f33d5daa5724997c7e2ec33c0a8f2
4 changes: 2 additions & 2 deletions tokio/src/io/poll_evented.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,15 +137,15 @@ impl<E: Source> PollEvented<E> {
Ok(inner)
}

#[cfg(feature = "process")]
#[cfg(all(feature = "process", target_os = "linux"))]
pub(crate) fn poll_read_ready(&self, cx: &mut Context<'_>) -> Poll<io::Result<()>> {
self.registration
.poll_read_ready(cx)
.map_err(io::Error::from)
.map_ok(|_| ())
}

#[cfg(feature = "process")]
#[cfg(all(feature = "process", target_os = "linux"))]
pub(crate) fn scheduler_handle(&self) -> &scheduler::Handle {
self.registration.scheduler_handle()
}
Expand Down
2 changes: 1 addition & 1 deletion tokio/src/runtime/io/registration.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ impl Registration {
self.handle.driver().io()
}

#[cfg(feature = "process")]
#[cfg(all(feature = "process", target_os = "linux"))]
pub(crate) fn scheduler_handle(&self) -> &scheduler::Handle {
&self.handle
}
Expand Down