InTheForest/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-01-11 18:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

modernize: Use b.Loop (introduced in Go 1.24)

Browse Source 
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
This commit is contained in:
Paweł Gronowski
2025-12-15 17:51:24 +01:00
parent 239a49d403
commit c9b0a21bb1
15 changed files with 40 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
daemon/builder/remotecontext/internal/tarsum/tarsum_test.go
View File

@@ -580,8 +580,8 @@ func Benchmark9kTar(b *testing.B) {
reader := bytes.NewReader(buf.Bytes())
b.SetBytes(n)
b.ResetTimer()
for i := 0; i < b.N; i++ {
for b.Loop() {
reader.Seek(0, 0)
ts, err := NewTarSum(reader, true, Version0)
if err != nil {
@@ -611,8 +611,8 @@ func Benchmark9kTarGzip(b *testing.B) {
reader := bytes.NewReader(buf.Bytes())
b.SetBytes(n)
b.ResetTimer()
for i := 0; i < b.N; i++ {
for b.Loop() {
reader.Seek(0, 0)
ts, err := NewTarSum(reader, false, Version0)
if err != nil {

16
daemon/container/view_test.go
View File

@@ -350,8 +350,8 @@ func BenchmarkDBAdd100(b *testing.B) {
for i := 0; i < 100; i++ {
testSet = append(testSet, stringid.GenerateRandomID())
}
b.ResetTimer()
for i := 0; i < b.N; i++ {
for b.Loop() {
db, err := NewViewDB()
if err != nil {
b.Fatal(err)
@@ -381,8 +381,8 @@ func BenchmarkDBGetByPrefix100(b *testing.B) {
l := rand.Intn(12) + 12
testKeys = append(testKeys, id[:l])
}
b.ResetTimer()
for i := 0; i < b.N; i++ {
for b.Loop() {
for _, id := range testKeys {
if res, err := db.GetByPrefix(id); err != nil {
b.Fatal(res, err)
@@ -408,8 +408,8 @@ func BenchmarkDBGetByPrefix250(b *testing.B) {
l := rand.Intn(12) + 12
testKeys = append(testKeys, id[:l])
}
b.ResetTimer()
for i := 0; i < b.N; i++ {
for b.Loop() {
for _, id := range testKeys {
if res, err := db.GetByPrefix(id); err != nil {
b.Fatal(res, err)
@@ -435,8 +435,8 @@ func BenchmarkDBGetByPrefix500(b *testing.B) {
l := rand.Intn(12) + 12
testKeys = append(testKeys, id[:l])
}
b.ResetTimer()
for i := 0; i < b.N; i++ {
for b.Loop() {
for _, id := range testKeys {
if res, err := db.GetByPrefix(id); err != nil {
b.Fatal(res, err)

2
daemon/internal/filedescriptors/filiedescriptors_linux_test.go
View File

@@ -8,7 +8,7 @@ import (
func BenchmarkGetTotalUsedFds(b *testing.B) {
ctx := context.Background()
b.ReportAllocs()
for i := 0; i < b.N; i++ {
for b.Loop() {
_ = GetTotalUsedFds(ctx)
}
}

4
daemon/internal/stdcopymux/stdcopy_test.go
View File

@@ -287,8 +287,8 @@ func BenchmarkWrite(b *testing.B) {
data := []byte("Test line for testing stdwriter performance\n")
data = bytes.Repeat(data, 100)
b.SetBytes(int64(len(data)))
b.ResetTimer()
for i := 0; i < b.N; i++ {
for b.Loop() {
if _, err := w.Write(data); err != nil {
b.Fatal(err)
}

4
daemon/internal/stream/bytespipe/bytespipe_test.go
View File

@@ -184,7 +184,7 @@ func TestBytesPipeWriteRandomChunks(t *testing.T) {
func BenchmarkBytesPipeWrite(b *testing.B) {
b.ReportAllocs()
testData := []byte("pretty short line, because why not?")
for i := 0; i < b.N; i++ {
for b.Loop() {
readBuf := make([]byte, 1024)
buf := New()
go func() {
@@ -203,7 +203,7 @@ func BenchmarkBytesPipeWrite(b *testing.B) {
func BenchmarkBytesPipeRead(b *testing.B) {
b.ReportAllocs()
rd := make([]byte, 512)
for i := 0; i < b.N; i++ {
for b.Loop() {
b.StopTimer()
buf := New()
for j := 0; j < 500; j++ {

4
daemon/internal/stream/unbuffered_test.go
View File

@@ -145,8 +145,8 @@ func BenchmarkUnbuffered(b *testing.B) {
buf.WriteString(testLine)
testText := buf.Bytes()
b.SetBytes(int64(5 * len(testText)))
b.ResetTimer()
for i := 0; i < b.N; i++ {
for b.Loop() {
b.StopTimer()
setUpWriter()
b.StartTimer()

2
daemon/libnetwork/etchosts/etchosts_test.go
View File

@@ -453,7 +453,7 @@ func benchDelete(b *testing.B) {
}
func BenchmarkDelete(b *testing.B) {
for i := 0; i < b.N; i++ {
for b.Loop() {
benchDelete(b)
}
}

2
daemon/libnetwork/internal/resolvconf/resolvconf_test.go
View File

@@ -580,7 +580,7 @@ func BenchmarkGenerate(b *testing.B) {
}
b.ReportAllocs()
for i := 0; i < b.N; i++ {
for b.Loop() {
_, err := rc.Generate(true)
if err != nil {
b.Fatal(err)

4
daemon/libnetwork/ipams/defaultipam/allocator_test.go
View File

@@ -1331,7 +1331,7 @@ func BenchmarkPoolIDToString(b *testing.B) {
}
b.ReportAllocs()
for i := 0; i < b.N; i++ {
for b.Loop() {
_ = k.String()
}
}
@@ -1340,7 +1340,7 @@ func BenchmarkPoolIDFromString(b *testing.B) {
const poolIDString = "default/172.27.0.0/16/172.27.3.0/24"
b.ReportAllocs()
for i := 0; i < b.N; i++ {
for b.Loop() {
_, err := PoolIDFromString(poolIDString)
if err != nil {
b.Fatal(err)

2
daemon/libnetwork/portallocator/portallocator_test.go
View File

@@ -147,7 +147,7 @@ func TestAllocateAllPorts(t *testing.T) {
func BenchmarkAllocatePorts(b *testing.B) {
p := newInstance()
for n := 0; n < b.N; n++ {
for b.Loop() {
for i := 0; i <= p.end-p.begin; i++ {
port, err := p.RequestPort(net.IPv4zero, "tcp", 0)
if err != nil {

4
daemon/links/links_test.go
View File

@@ -143,8 +143,8 @@ func TestLinkMultipleEnv(t *testing.T) {
func BenchmarkLinkMultipleEnv(b *testing.B) {
b.ReportAllocs()
b.ResetTimer()
for i := 0; i < b.N; i++ {
for b.Loop() {
_ = EnvVars("172.0.17.3", "172.0.17.2", "/db/docker", []string{"PASSWORD=gordon"}, network.PortSet{
network.MustParsePort("6300/udp"): struct{}{},
network.MustParsePort("6379/tcp"): struct{}{},

7
daemon/logger/awslogs/cloudwatchlogs_test.go
View File

@@ -728,7 +728,7 @@ func TestCollectBatchMultilinePattern(t *testing.T) {
}
func BenchmarkCollectBatch(b *testing.B) {
for i := 0; i < b.N; i++ {
for b.Loop() {
mockClient := &mockClient{}
stream := &logStream{
client: mockClient,
@@ -759,7 +759,7 @@ func BenchmarkCollectBatch(b *testing.B) {
}
func BenchmarkCollectBatchMultilinePattern(b *testing.B) {
for i := 0; i < b.N; i++ {
for b.Loop() {
mockClient := &mockClient{}
multilinePattern := regexp.MustCompile(`\d{4}-(?:0[1-9]|1[0-2])-(?:0[1-9]|[1,2][0-9]|3[0,1]) (?:[0,1][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9]`)
stream := &logStream{
@@ -1666,8 +1666,7 @@ func BenchmarkUnwrapEvents(b *testing.B) {
}
}
b.ResetTimer()
for i := 0; i < b.N; i++ {
for b.Loop() {
res := unwrapEvents(events)
assert.Check(b, is.Len(res, maximumLogEventsPerPut))
}

16
daemon/logger/ring_test.go
View File

@@ -158,7 +158,7 @@ func BenchmarkRingLoggerThroughputNoReceiver(b *testing.B) {
msg := &Message{Line: []byte("hello humans and everyone else!")}
b.SetBytes(int64(len(msg.Line)))
for i := 0; i < b.N; i++ {
for b.Loop() {
if err := l.Log(msg); err != nil {
b.Fatal(err)
}
@@ -170,7 +170,7 @@ func BenchmarkRingLoggerThroughputWithReceiverDelay0(b *testing.B) {
msg := &Message{Line: []byte("hello humans and everyone else!")}
b.SetBytes(int64(len(msg.Line)))
for i := 0; i < b.N; i++ {
for b.Loop() {
if err := l.Log(msg); err != nil {
b.Fatal(err)
}
@@ -206,7 +206,7 @@ func BenchmarkRingLoggerThroughputConsumeDelay1(b *testing.B) {
cancel := consumeWithDelay(1*time.Millisecond, mockLog.c)
defer cancel()
for i := 0; i < b.N; i++ {
for b.Loop() {
if err := l.Log(msg); err != nil {
b.Fatal(err)
}
@@ -223,7 +223,7 @@ func BenchmarkRingLoggerThroughputConsumeDelay10(b *testing.B) {
cancel := consumeWithDelay(10*time.Millisecond, mockLog.c)
defer cancel()
for i := 0; i < b.N; i++ {
for b.Loop() {
if err := l.Log(msg); err != nil {
b.Fatal(err)
}
@@ -240,7 +240,7 @@ func BenchmarkRingLoggerThroughputConsumeDelay50(b *testing.B) {
cancel := consumeWithDelay(50*time.Millisecond, mockLog.c)
defer cancel()
for i := 0; i < b.N; i++ {
for b.Loop() {
if err := l.Log(msg); err != nil {
b.Fatal(err)
}
@@ -257,7 +257,7 @@ func BenchmarkRingLoggerThroughputConsumeDelay100(b *testing.B) {
cancel := consumeWithDelay(100*time.Millisecond, mockLog.c)
defer cancel()
for i := 0; i < b.N; i++ {
for b.Loop() {
if err := l.Log(msg); err != nil {
b.Fatal(err)
}
@@ -274,7 +274,7 @@ func BenchmarkRingLoggerThroughputConsumeDelay300(b *testing.B) {
cancel := consumeWithDelay(300*time.Millisecond, mockLog.c)
defer cancel()
for i := 0; i < b.N; i++ {
for b.Loop() {
if err := l.Log(msg); err != nil {
b.Fatal(err)
}
@@ -291,7 +291,7 @@ func BenchmarkRingLoggerThroughputConsumeDelay500(b *testing.B) {
cancel := consumeWithDelay(500*time.Millisecond, mockLog.c)
defer cancel()
for i := 0; i < b.N; i++ {
for b.Loop() {
if err := l.Log(msg); err != nil {
b.Fatal(err)
}

2
internal/namesgenerator/names-generator_test.go
View File

@@ -28,7 +28,7 @@ func TestNameRetries(t *testing.T) {
func BenchmarkGetRandomName(b *testing.B) {
b.ReportAllocs()
var out string
for n := 0; n < b.N; n++ {
for b.Loop() {
out = GetRandomName(5)
}
b.Log("Last result:", out)

4
pkg/tailfile/tailfile_test.go
View File

@@ -151,8 +151,8 @@ func BenchmarkTail(b *testing.B) {
b.Fatal(err)
}
}
b.ResetTimer()
for i := 0; i < b.N; i++ {
for b.Loop() {
if _, err := TailFile(f, 1000); err != nil {
b.Fatal(err)
}