swarm: Dedup addresses to dial #2322
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
Co-authored-by: Aayush Rajasekaran <arajasek94@gmail.com>
sukunrt
reviewed
Jun 2, 2023
Comment on lines
+189
to
+196
|
|
||
| // DedupAddrs deduplicates addresses in place, leave only unique addresses. | ||
| // It doesn't allocate. | ||
| func DedupAddrs(addrs []ma.Multiaddr) []ma.Multiaddr { | ||
| if len(addrs) == 0 { | ||
| return addrs | ||
| } | ||
| sort.Slice(addrs, func(i, j int) bool { return bytes.Compare(addrs[i].Bytes(), addrs[j].Bytes()) < 0 }) |
There was a problem hiding this comment.
Apologies for the drive by comment. Feel free to ignore.
Sort.Slice will allocate unfortunately :(
golang/go#17332
func BenchmarkDedupAddrs(b *testing.B) {
b.ReportAllocs()
tcpAddr := ma.StringCast("/ip4/127.0.0.1/tcp/1234")
quicAddr := ma.StringCast("/ip4/127.0.0.1/udp/1234/quic-v1")
wsAddr := ma.StringCast("/ip4/127.0.0.1/tcp/1234/ws")
addrs := []ma.Multiaddr{tcpAddr, quicAddr, tcpAddr, quicAddr, wsAddr}
for i := 0; i < b.N; i++ {
addrs = DedupAddrs(addrs)
}
}
There was a problem hiding this comment.
Unfortunate. Given this is pre-existing code, I'll leave it. But I'll open an issue
MarcoPolo
added a commit
that referenced
this pull request
Jun 2, 2023
* Dedup addresses to dial Co-authored-by: Aayush Rajasekaran <arajasek94@gmail.com> * Move DedupAddrs test * Typo --------- Co-authored-by: Aayush Rajasekaran <arajasek94@gmail.com>
MarcoPolo
added a commit
that referenced
this pull request
Jun 2, 2023
* swarm: Dedup addresses to dial (#2322) * Dedup addresses to dial Co-authored-by: Aayush Rajasekaran <arajasek94@gmail.com> * Move DedupAddrs test * Typo --------- Co-authored-by: Aayush Rajasekaran <arajasek94@gmail.com> * Release version v0.27.5 --------- Co-authored-by: Aayush Rajasekaran <arajasek94@gmail.com>
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.
I moved the DedupAddrs function to
core/networksince that seemed like the most relevant place for it to be so that basic_host and swarm can use it. Really this should probably be part of the multiaddr package. Although I would say we make that change later.This change makes
swarm.addrsForDialreturn only unique addresses. This is assumed by they dialWorker. I also added some existence checks to avoid any potential panics in case the key was missing from the pending map.Most of this diff is a test or moving code around. The real change is the one line in swarm_dial.go.