Commit 496cf215 authored by Austin Clements's avatar Austin Clements Committed by David Chase

crypto/tls: gofmt

Commit fa3543e3 introduced formatting errors.

Change-Id: I4b921f391a9b463cefca4318ad63b70ae6ce6865
Reviewed-on: https://go-review.googlesource.com/23514Reviewed-by: default avatarDavid Chase <drchase@google.com>
Run-TryBot: David Chase <drchase@google.com>
parent e149624e
...@@ -78,9 +78,9 @@ type Conn struct { ...@@ -78,9 +78,9 @@ type Conn struct {
// bytesSent counts the bytes of application data sent. // bytesSent counts the bytes of application data sent.
// packetsSent counts packets. // packetsSent counts packets.
bytesSent int64 bytesSent int64
packetsSent int64 packetsSent int64
// activeCall is an atomic int32; the low bit is whether Close has // activeCall is an atomic int32; the low bit is whether Close has
// been called. the rest of the bits are the number of goroutines // been called. the rest of the bits are the number of goroutines
// in Conn.Write. // in Conn.Write.
...@@ -788,15 +788,15 @@ func (c *Conn) maxPayloadSizeForWrite(typ recordType, explicitIVLen int) int { ...@@ -788,15 +788,15 @@ func (c *Conn) maxPayloadSizeForWrite(typ recordType, explicitIVLen int) int {
panic("unknown cipher type") panic("unknown cipher type")
} }
} }
// Allow packet growth in arithmetic progression up to max. // Allow packet growth in arithmetic progression up to max.
pkt := c.packetsSent pkt := c.packetsSent
c.packetsSent++ c.packetsSent++
if pkt > 1000 { if pkt > 1000 {
return maxPlaintext // avoid overflow in multiply below return maxPlaintext // avoid overflow in multiply below
} }
n := payloadBytes * int(pkt + 1) n := payloadBytes * int(pkt+1)
if n > maxPlaintext { if n > maxPlaintext {
n = maxPlaintext n = maxPlaintext
} }
......
...@@ -527,7 +527,7 @@ func throughput(b *testing.B, totalBytes int64, dynamicRecordSizingDisabled bool ...@@ -527,7 +527,7 @@ func throughput(b *testing.B, totalBytes int64, dynamicRecordSizingDisabled bool
func BenchmarkThroughput(b *testing.B) { func BenchmarkThroughput(b *testing.B) {
for _, mode := range []string{"Max", "Dynamic"} { for _, mode := range []string{"Max", "Dynamic"} {
for size := 1; size <= 64; size<<=1{ for size := 1; size <= 64; size <<= 1 {
name := fmt.Sprintf("%sPacket/%dMB", mode, size) name := fmt.Sprintf("%sPacket/%dMB", mode, size)
b.Run(name, func(b *testing.B) { b.Run(name, func(b *testing.B) {
throughput(b, int64(size<<20), mode == "Max") throughput(b, int64(size<<20), mode == "Max")
...@@ -548,8 +548,8 @@ func (c *slowConn) Write(p []byte) (int, error) { ...@@ -548,8 +548,8 @@ func (c *slowConn) Write(p []byte) (int, error) {
t0 := time.Now() t0 := time.Now()
wrote := 0 wrote := 0
for wrote < len(p) { for wrote < len(p) {
time.Sleep(100*time.Microsecond) time.Sleep(100 * time.Microsecond)
allowed := int(time.Since(t0).Seconds() * float64(c.bps)) / 8 allowed := int(time.Since(t0).Seconds()*float64(c.bps)) / 8
if allowed > len(p) { if allowed > len(p) {
allowed = len(p) allowed = len(p)
} }
...@@ -617,7 +617,6 @@ func latency(b *testing.B, bps int, dynamicRecordSizingDisabled bool) { ...@@ -617,7 +617,6 @@ func latency(b *testing.B, bps int, dynamicRecordSizingDisabled bool) {
} }
} }
func BenchmarkLatency(b *testing.B) { func BenchmarkLatency(b *testing.B) {
for _, mode := range []string{"Max", "Dynamic"} { for _, mode := range []string{"Max", "Dynamic"} {
for _, kbps := range []int{200, 500, 1000, 2000, 5000} { for _, kbps := range []int{200, 500, 1000, 2000, 5000} {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment