Refactor sync::batch_semaphore::Semaphore::poll_acquire
#7046
+75
−71
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
cip999
force-pushed
the
batch-semaphore
branch
from
30ebf9e to
4c24022
Compare
This commit tries to make the logic in `poll_acquire` flow more naturally, while also using more descriptive names and improving commentary (including the addition of a missing "SAFETY:" annotation). There should be no functional changes.
cip999
force-pushed
the
batch-semaphore
branch
from
4c24022 to
74df9e7
Compare
Darksonn
reviewed
Jan 8, 2025
tokio/src/sync/batch_semaphore.rs
Outdated
| return Poll::Ready(Err(AcquireError::closed())); | ||
| } | ||
|
|
||
| acquired >>= Self::PERMIT_SHIFT; |
There was a problem hiding this comment.
I find it to be confusing when the meaning of this is changed like this. Previously, it's the number of permits shifted, and after it's the actual number of permits. Can we use a different variable name prior to this that makes it clear that it's not just the number of permits?
There was a problem hiding this comment.
Agreed, but gosh is it hard to find a good name. I renamed to acquired_shifted before the shift, but now I feel I should append _shifted to a bunch of other variables, for consistency. But then it just looks awkward...
cip999
force-pushed
the
batch-semaphore
branch
from
f72570b to
b4e45b0
Compare
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.
Motivation
I found the implementation of the low-level semaphore a bit hard to read compared to other code (possibly because it has been untouched for some years). It could potentially benefit from small rewrites, better documentation, and the like.
Solution
Well, I thought it would be faster to attempt a PR for an initial change, rather than opening an issue. But I have no expectations that it will be merged. :)
I reworked the
poll_acquiremethod, these are the major changes:This probably needs a thorough review to make sure that I haven't messed up anything (or more likely, figure out what I have). If this kind of refactoring is accepted in core modules, I'm also happy to follow up with similar ones.