From 9e5a083aa925fbbcd113365ce8b9b3891c252fab Mon Sep 17 00:00:00 2001 From: Robert Griesemer Date: Fri, 27 May 2016 19:47:55 -0700 Subject: [PATCH] crypto/tls: remove unused variable in benchmark code This fixes `go test go/types`. https://golang.org/cl/23487/ introduced this code which contains two unused variables (declared and assigned to, but never read). cmd/compile doesn't report the error due open issue #8560 (the variables are assigned to in a closure), but go/types does. The build bot only runs go/types tests in -short mode (which doesn't typecheck the std lib), hence this doesn't show up on the dashboard either. We cannot call b.Fatal and friends in the goroutine. Communicating the error to the invoking function requires a channel or a mutex. Unless the channel/sycnhronized variable is tested in each iteration that follows, the iteration blocks if there's a failure. Testing in each iteration may affect benchmark times. One could use a time-out but that time depends on the underlying system. Panicking seems good enough in this unlikely case; better than hanging or affecting benchmark times. Change-Id: Idce1172da8058e580fa3b3e398825b0eb4316325 Reviewed-on: https://go-review.googlesource.com/23528 Reviewed-by: Ian Lance Taylor Run-TryBot: Ian Lance Taylor TryBot-Result: Gobot Gobot --- tls_test.go | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/tls_test.go b/tls_test.go index 47f02be..5b665bf 100644 --- a/tls_test.go +++ b/tls_test.go @@ -481,20 +481,19 @@ func throughput(b *testing.B, totalBytes int64, dynamicRecordSizingDisabled bool N := b.N - var serr error go func() { for i := 0; i < N; i++ { sconn, err := ln.Accept() if err != nil { - serr = err - return + // panic rather than synchronize to avoid benchmark overhead + // (cannot call b.Fatal in goroutine) + panic(fmt.Errorf("accept: %v", err)) } serverConfig := *testConfig serverConfig.DynamicRecordSizingDisabled = dynamicRecordSizingDisabled srv := Server(sconn, &serverConfig) if err := srv.Handshake(); err != nil { - serr = fmt.Errorf("handshake: %v", err) - return + panic(fmt.Errorf("handshake: %v", err)) } io.Copy(srv, srv) } @@ -570,20 +569,19 @@ func latency(b *testing.B, bps int, dynamicRecordSizingDisabled bool) { N := b.N - var serr error go func() { for i := 0; i < N; i++ { sconn, err := ln.Accept() if err != nil { - serr = err - return + // panic rather than synchronize to avoid benchmark overhead + // (cannot call b.Fatal in goroutine) + panic(fmt.Errorf("accept: %v", err)) } serverConfig := *testConfig serverConfig.DynamicRecordSizingDisabled = dynamicRecordSizingDisabled srv := Server(&slowConn{sconn, bps}, &serverConfig) if err := srv.Handshake(); err != nil { - serr = fmt.Errorf("handshake: %v", err) - return + panic(fmt.Errorf("handshake: %v", err)) } io.Copy(srv, srv) }