feat(smr): do not schedule the same timeout twice#1508
Merged
romac merged 14 commits intocirclefin:mainfrom Mar 6, 2026
Merged
feat(smr): do not schedule the same timeout twice#1508romac merged 14 commits intocirclefin:mainfrom
romac merged 14 commits intocirclefin:mainfrom
Conversation
* A bool[3] array not considered in comparisons using derivative * TimeoutKind can be used to index this array
This comment was marked as outdated.
This comment was marked as outdated.
cason
commented
Feb 27, 2026
This comment was marked as off-topic.
This comment was marked as off-topic.
romac
reviewed
Feb 27, 2026
refactor: Use a bit set instead of an array
cason
commented
Mar 2, 2026
|
|
||
| /// Helper to map a `TimeoutKind` to its specific bitmask. | ||
| /// Returns `None` for timeouts that are not tracked per-round. | ||
| const fn mask(timeout: TimeoutKind) -> Option<u8> { |
Contributor
Author
There was a problem hiding this comment.
An alternative solution is to use Step as index, see: cason#5
romac
approved these changes
Mar 6, 2026
Contributor
nenadmilosevic95
left a comment
nenadmilosevic95
left a comment
There was a problem hiding this comment.
LGTM! Great work!
| ); | ||
| debug_trace!(state, Line::L18); | ||
|
|
||
| debug_assert!(state.check_timeout(TimeoutKind::Propose)); |
Contributor
There was a problem hiding this comment.
This line will be stripped entirely in release builds since it's inside a debug_assert!?
Contributor
There was a problem hiding this comment.
I guess it is fine because it is a propose timeout, although it will be nicer if it is consistent with prevote and precommit. But not critical anyway
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
3 participants
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.
Closes: #1500
Alternative to #1501.
Creates a
scheduled_timeoutsboolean array in the state machineState, which is reset tofalseat every round. Before scheduling a timeout for a givenTimeoutKind, checks if the corresponding slot of the array is taken. If not, mark is as taken an return the timeout as output. Otherwise, don't produce a duplicateTimeoutevent.In other to prevent tests from breaking,
scheduled_timeoutsis not considered forPartialEqcomparisons.