refactor(queue): remove retain from PacketQueue trait - #206
Merged
Conversation
There was a problem hiding this comment.
Pull request overview
This PR refactors the bandwidth queue abstraction by removing the trait-level retain method (previously buggy / inconsistent across implementations) and reintroducing retain only where it is needed (DropTail), with correct now_bytes accounting.
Changes:
- Removed
retainfrom thePacketQueuetrait and deleted the corresponding impls from all queue types. - Added an inherent
DropTailQueue::retainthat decrementsnow_byteswhen packets are dropped by the predicate. - Kept the token-bucket shrink behavior supported via the concrete
DropTailQueueAPI.
Reviewed changes
Copilot reviewed 5 out of 5 changed files in this pull request and generated 2 comments.
Show a summary per file
| File | Description |
|---|---|
| rattan-core/src/cells/bandwidth/queue/mod.rs | Removes retain from the PacketQueue trait surface. |
| rattan-core/src/cells/bandwidth/queue/infinite.rs | Drops the no-longer-needed retain impl. |
| rattan-core/src/cells/bandwidth/queue/droptail.rs | Adds DropTailQueue::retain with now_bytes maintenance. |
| rattan-core/src/cells/bandwidth/queue/drophead.rs | Drops the no-longer-needed retain impl. |
| rattan-core/src/cells/bandwidth/queue/codel.rs | Drops the no-longer-needed retain impl. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
This file contains hidden or 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
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.
The trait-level
retainwas buggy in every impl (never updatednow_bytesafter dropping packets) and is only used by TBF's DropTail queue, so maintaining it on the trait isn't worth it. Remove it from the trait and reimplement it as an inherent method onDropTailQueue<P>that correctly maintainsnow_bytes.