p2p/enode: fix FairMix timer handling#18732
Merged
anacrolix merged 1 commit intoerigontech:mainfrom Jan 22, 2026
Merged
Conversation
anacrolix
approved these changes
Jan 22, 2026
Contributor
|
In hindsight, since Go 1.23, the only thing that was actually needed here was to remove the defer. In #18754 I've also avoided the extra timer allocations too. |
taratorio
pushed a commit
that referenced
this pull request
Jan 22, 2026
#18732 correctly identifies timer cleanup defers stacking unnecessarily. This handles the cleanup and channel management per Go 1.23.
angelsmia777-milionz
approved these changes
Jan 22, 2026
angelsmia777-milionz
left a comment
angelsmia777-milionz
left a comment
There was a problem hiding this comment.
Process difficulty was extremely a lot.
angelsmia777-milionz
approved these changes
Jan 22, 2026
angelsmia777-milionz
left a comment
angelsmia777-milionz
left a comment
There was a problem hiding this comment.
I did not know about the timers did this change the information
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.
FairMix.Nextcreated a new timer on each loop iteration and deferredtimer.Stop()until the function returned. When multiple iterations occurred (e.g., sources ended or Next waited on fromAny), timers accumulated unnecessarily and stayed alive longer than needed.Stop timers explicitly per-iteration inside
FairMix.Nextto avoid accumulating deferred timers and reduce redundant allocations.