kris/th5
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

crypto/tls: fix race in Benchmark{Throughput,Latency}

Browse Source 
Fixes #15864.

Change-Id: Ic12aa3654bf0b7e4a26df20ea92d07d7efe7339c
Reviewed-on: https://go-review.googlesource.com/23504
Reviewed-by: David Chase <drchase@google.com>
This commit is contained in:
Mikio Hara 2016-05-28 03:20:11 +09:00 committed by David Chase
parent 81aa612742
commit cbcba9f9b6
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tls_test.go
View File

@ -479,9 +479,11 @@ func throughput(b *testing.B, totalBytes int64, dynamicRecordSizingDisabled bool
ln := newLocalListener(b) ln := newLocalListener(b)
defer ln.Close() defer ln.Close()
N := b.N
var serr error var serr error
go func() { go func() {
for i := 0; i < b.N; i++ { for i := 0; i < N; i++ {
sconn, err := ln.Accept() sconn, err := ln.Accept()
if err != nil { if err != nil {
serr = err serr = err
@ -504,7 +506,7 @@ func throughput(b *testing.B, totalBytes int64, dynamicRecordSizingDisabled bool
buf := make([]byte, 1<<16) buf := make([]byte, 1<<16)
chunks := int(math.Ceil(float64(totalBytes) / float64(len(buf)))) chunks := int(math.Ceil(float64(totalBytes) / float64(len(buf))))
for i := 0; i < b.N; i++ { for i := 0; i < N; i++ {
conn, err := Dial("tcp", ln.Addr().String(), &clientConfig) conn, err := Dial("tcp", ln.Addr().String(), &clientConfig)
if err != nil { if err != nil {
b.Fatal(err) b.Fatal(err)
@ -566,9 +568,11 @@ func latency(b *testing.B, bps int, dynamicRecordSizingDisabled bool) {
ln := newLocalListener(b) ln := newLocalListener(b)
defer ln.Close() defer ln.Close()
N := b.N
var serr error var serr error
go func() { go func() {
for i := 0; i < b.N; i++ { for i := 0; i < N; i++ {
sconn, err := ln.Accept() sconn, err := ln.Accept()
if err != nil { if err != nil {
serr = err serr = err
@ -591,7 +595,7 @@ func latency(b *testing.B, bps int, dynamicRecordSizingDisabled bool) {
buf := make([]byte, 16384) buf := make([]byte, 16384)
peek := make([]byte, 1) peek := make([]byte, 1)
for i := 0; i < b.N; i++ { for i := 0; i < N; i++ {
conn, err := Dial("tcp", ln.Addr().String(), &clientConfig) conn, err := Dial("tcp", ln.Addr().String(), &clientConfig)
if err != nil { if err != nil {
b.Fatal(err) b.Fatal(err)