webnet/tailscale
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

all: use Go 1.22 range-over-int

Browse Source 
Updates #11058

Change-Id: I35e7ef9b90e83cac04ca93fd964ad00ed5b48430
Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
This commit is contained in:
Brad Fitzpatrick
2024-04-16 13:15:13 -07:00
committed by Brad Fitzpatrick
parent 068db1f972
commit 7c1d6e35a5
143 changed files with 280 additions and 282 deletions
Download Patch File Download Diff File Expand all files Collapse all files
net/art/stride_table_test.go
+9 -9
View File
@@ -18,7 +18,7 @@ import (
func TestInversePrefix(t *testing.T) {
t.Parallel()
for i := 0; i < 256; i++ {
for i := range 256 {
for len := 0; len < 9; len++ {
addr := i & (0xFF << (8 - len))
idx := prefixIndex(uint8(addr), len)
@@ -32,7 +32,7 @@ func TestInversePrefix(t *testing.T) {
func TestHostIndex(t *testing.T) {
t.Parallel()
for i := 0; i < 256; i++ {
for i := range 256 {
got := hostIndex(uint8(i))
want := prefixIndex(uint8(i), 8)
if got != want {
@@ -63,7 +63,7 @@ func TestStrideTableInsert(t *testing.T) {
}
}
for i := 0; i < 256; i++ {
for i := range 256 {
addr := uint8(i)
slowVal, slowOK := slow.get(addr)
fastVal, fastOK := fast.get(addr)
@@ -103,7 +103,7 @@ func TestStrideTableInsertShuffled(t *testing.T) {
// Order of insertion should not affect the final shape of the stride table.
routes2 := append([]slowEntry[int](nil), routes...) // dup so we can print both slices on fail
for i := 0; i < 100; i++ {
for range 100 {
rand.Shuffle(len(routes2), func(i, j int) { routes2[i], routes2[j] = routes2[j], routes2[i] })
rt2 := strideTable[int]{}
for _, route := range routes2 {
@@ -152,7 +152,7 @@ func TestStrideTableDelete(t *testing.T) {
t.Fatalf("slowTable has %d entries after deletes, want 50", cnt)
}
for i := 0; i < 256; i++ {
for i := range 256 {
addr := uint8(i)
slowVal, slowOK := slow.get(addr)
fastVal, fastOK := fast.get(addr)
@@ -188,7 +188,7 @@ func TestStrideTableDeleteShuffle(t *testing.T) {
// Order of deletion should not affect the final shape of the stride table.
toDelete2 := append([]slowEntry[int](nil), toDelete...) // dup so we can print both slices on fail
for i := 0; i < 100; i++ {
for range 100 {
rand.Shuffle(len(toDelete2), func(i, j int) { toDelete2[i], toDelete2[j] = toDelete2[j], toDelete2[i] })
rt2 := strideTable[int]{}
for _, route := range routes {
@@ -262,7 +262,7 @@ func forStrideCountAndOrdering(b *testing.B, fn func(b *testing.B, routes []slow
func BenchmarkStrideTableInsertion(b *testing.B) {
forStrideCountAndOrdering(b, func(b *testing.B, routes []slowEntry[int]) {
val := 0
for i := 0; i < b.N; i++ {
for range b.N {
var rt strideTable[int]
for _, route := range routes {
rt.insert(route.addr, route.len, val)
@@ -285,7 +285,7 @@ func BenchmarkStrideTableDeletion(b *testing.B) {
}
b.ResetTimer()
for i := 0; i < b.N; i++ {
for range b.N {
rt2 := rt
for _, route := range routes {
rt2.delete(route.addr, route.len)
@@ -311,7 +311,7 @@ func BenchmarkStrideTableGet(b *testing.B) {
}
b.ResetTimer()
for i := 0; i < b.N; i++ {
for i := range b.N {
writeSink, _ = rt.get(uint8(i))
}
gets := float64(b.N)
net/art/table_test.go
+10 -10
View File
@@ -594,7 +594,7 @@ func TestInsertCompare(t *testing.T) {
seenVals4 := map[int]bool{}
seenVals6 := map[int]bool{}
for i := 0; i < 10_000; i++ {
for range 10_000 {
a := randomAddr()
slowVal, slowOK := slow.get(a)
fastVal, fastOK := fast.Get(a)
@@ -644,12 +644,12 @@ func TestInsertShuffled(t *testing.T) {
}
}()
for i := 0; i < 10; i++ {
for range 10 {
pfxs2 := append([]slowPrefixEntry[int](nil), pfxs...)
rand.Shuffle(len(pfxs2), func(i, j int) { pfxs2[i], pfxs2[j] = pfxs2[j], pfxs2[i] })
addrs := make([]netip.Addr, 0, 10_000)
for i := 0; i < 10_000; i++ {
for range 10_000 {
addrs = append(addrs, randomAddr())
}
@@ -723,7 +723,7 @@ func TestDeleteCompare(t *testing.T) {
seenVals4 := map[int]bool{}
seenVals6 := map[int]bool{}
for i := 0; i < numProbes; i++ {
for range numProbes {
a := randomAddr()
slowVal, slowOK := slow.get(a)
fastVal, fastOK := fast.Get(a)
@@ -789,7 +789,7 @@ func TestDeleteShuffled(t *testing.T) {
rt.Delete(pfx.pfx)
}
for i := 0; i < 10; i++ {
for range 10 {
pfxs2 := append([]slowPrefixEntry[int](nil), pfxs...)
toDelete2 := append([]slowPrefixEntry[int](nil), toDelete...)
rand.Shuffle(len(toDelete2), func(i, j int) { toDelete2[i], toDelete2[j] = toDelete2[j], toDelete2[i] })
@@ -806,7 +806,7 @@ func TestDeleteShuffled(t *testing.T) {
// Diffing a deep tree of tables gives cmp.Diff a nervous breakdown, so
// test for equivalence statistically with random probes instead.
for i := 0; i < numProbes; i++ {
for range numProbes {
a := randomAddr()
val1, ok1 := rt.Get(a)
val2, ok2 := rt2.Get(a)
@@ -909,7 +909,7 @@ func BenchmarkTableInsertion(b *testing.B) {
var startMem, endMem runtime.MemStats
runtime.ReadMemStats(&startMem)
b.StartTimer()
for i := 0; i < b.N; i++ {
for range b.N {
var rt Table[int]
for _, route := range routes {
rt.Insert(route.pfx, route.val)
@@ -944,7 +944,7 @@ func BenchmarkTableDelete(b *testing.B) {
var t runningTimer
allocs, bytes := getMemCost(func() {
for i := 0; i < b.N; i++ {
for range b.N {
var rt Table[int]
for _, route := range routes {
rt.Insert(route.pfx, route.val)
@@ -983,7 +983,7 @@ func BenchmarkTableGet(b *testing.B) {
// cost is 16 bytes - presumably due to some amortized costs in
// the memory allocator? Either way, empirically 100 iterations
// reliably reports the correct cost.
for i := 0; i < 100; i++ {
for range 100 {
_ = genAddr()
}
})
@@ -991,7 +991,7 @@ func BenchmarkTableGet(b *testing.B) {
addrBytes /= 100
var t runningTimer
allocs, bytes := getMemCost(func() {
for i := 0; i < b.N; i++ {
for range b.N {
addr := genAddr()
t.Start()
writeSink, _ = rt.Get(addr)