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

rt: pop at least one task from inject queue #5908

Merged
merged 1 commit into from
Aug 4, 2023
Merged

rt: pop at least one task from inject queue #5908

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
4 changes: 4 additions & 0 deletions tokio/src/runtime/scheduler/multi_thread/worker.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -787,6 +787,10 @@ impl Core {
cap,
);

// Take at least one task since the first task is returned directly
// and nto pushed onto the local queue.
let n = usize::max(1, n);
Comment on lines +790 to +792
Copy link
Contributor

Choose a reason for hiding this comment

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

Seems like you should add one to cap in the usize::min above instead, no?

Copy link
Member Author

Choose a reason for hiding this comment

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

I could... I thought it would be clearer to split it out w/ a comment.


let mut synced = worker.handle.shared.synced.lock();
// safety: passing in the correct `inject::Synced`.
let mut tasks = unsafe { worker.inject().pop_n(&mut synced.inject, n) };
Copy link
Contributor

Choose a reason for hiding this comment

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

In fact, maybe do this and drop the plus one in the first branch of usize::min?

Suggested change
let mut tasks = unsafe { worker.inject().pop_n(&mut synced.inject, n) };
let mut tasks = unsafe { worker.inject().pop_n(&mut synced.inject, n + 1) };

Copy link
Member Author

Choose a reason for hiding this comment

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

But that isn't the same. We don't want to always add 1; we want a min of 1

Expand Down