rt: pop at least one task from inject queue #5908
Merged
Conversation
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
When attempting to pull a batch of tasks from the injection queue, ensure we set the cap to at least one.
carllerche
added
A-tokio
github-actions
bot
added
the
R-loom-multi-thread
|
The current behavior is not incorrect but will result in less-than-optimal execution behavior. |
Darksonn
reviewed
Aug 3, 2023
Comment on lines
+790
to
+792
| // 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); |
There was a problem hiding this comment.
Seems like you should add one to cap in the usize::min above instead, no?
There was a problem hiding this comment.
I could... I thought it would be clearer to split it out w/ a comment.
Darksonn
reviewed
Aug 3, 2023
| // 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); | ||
|
|
||
| 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) }; |
There was a problem hiding this comment.
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) }; |
There was a problem hiding this comment.
But that isn't the same. We don't want to always add 1; we want a min of 1
Noah-Kennedy
approved these changes
Aug 3, 2023
Darksonn
approved these changes
Aug 3, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
When pulling a batch of tasks from the injection queue, ensure we set the cap to at least one.