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

process: avoid redundant effort to reap orphan processes #3743

Merged
merged 10 commits into from
May 14, 2021
Merged

process: avoid redundant effort to reap orphan processes #3743

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
ca535df
process: avoid redundant effort to reap orphan processes
ipetkov May 3, 2021
221d16e
add tests
ipetkov May 3, 2021
dd0610f
cleanup
ipetkov May 3, 2021
20dcd75
more cleanup
ipetkov May 3, 2021
9ec7251
more tests
ipetkov May 3, 2021
b58f4af
clippy
ipetkov May 3, 2021
0674052
cleanup
ipetkov May 5, 2021
001925b
more cleanup
ipetkov May 5, 2021
741e17d
Update tokio/src/process/unix/orphan.rs
ipetkov May 7, 2021
2c5c624
fixes
ipetkov May 8, 2021
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
more cleanup
  • Loading branch information
@ipetkov
ipetkov committed May 8, 2021
commit 001925bbaa9467e8450747adbe9b460045e0ab76
3 changes: 0 additions & 3 deletions tokio/src/process/unix/orphan.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,6 @@ impl<T> OrphanQueueImpl<T> {
// register/initialize here, so we can try again later
if let Ok(sigchild) = signal_with_handle(SignalKind::child(), &handle) {
*sigchild_guard = Some(sigchild);
drop(sigchild_guard);
drain_orphan_queue(queue);
}
}
Expand All @@ -103,8 +102,6 @@ fn drain_orphan_queue<T>(mut queue: MutexGuard<'_, Vec<T>>)
where
T: Wait,
{
// let mut queue = self.queue.lock().unwrap();
// let queue = &mut *queue;
for i in (0..queue.len()).rev() {
match queue[i].try_wait() {
Ok(None) => {}
Expand Down