From 97eb6aa096a9c07b8a88b4393b1463132d202d9b Mon Sep 17 00:00:00 2001 From: Andy Wang Date: Mon, 13 Apr 2020 19:40:23 +0100 Subject: [PATCH] Correct usages of b.SetBytes --- internal/multiplex/bufferedPipe_test.go | 11 +--- internal/multiplex/obfs_test.go | 68 +++++++------------------ internal/multiplex/session_test.go | 6 +-- internal/multiplex/stream_test.go | 24 +++------ internal/multiplex/switchboard_test.go | 8 +-- internal/test/integration_test.go | 4 +- internal/util/util_test.go | 11 ++-- 7 files changed, 38 insertions(+), 94 deletions(-) diff --git a/internal/multiplex/bufferedPipe_test.go b/internal/multiplex/bufferedPipe_test.go index be2bc82..80cf3a3 100644 --- a/internal/multiplex/bufferedPipe_test.go +++ b/internal/multiplex/bufferedPipe_test.go @@ -192,16 +192,9 @@ func BenchmarkBufferedPipe_RW(b *testing.B) { pipe.Read(smallBuf) } }() + b.SetBytes(int64(len(testData))) b.ResetTimer() for i := 0; i < b.N; i++ { - _, err := pipe.Write(testData) - if err != nil { - b.Error( - "For", "pipe write", - "got", err, - ) - return - } - b.SetBytes(PAYLOAD_LEN) + pipe.Write(testData) } } diff --git a/internal/multiplex/obfs_test.go b/internal/multiplex/obfs_test.go index 6f07d55..f5cc4a9 100644 --- a/internal/multiplex/obfs_test.go +++ b/internal/multiplex/obfs_test.go @@ -80,7 +80,7 @@ func BenchmarkObfs(b *testing.B) { testPayload, } - obfsBuf := make([]byte, 2048) + obfsBuf := make([]byte, defaultSendRecvBufSize) var key [32]byte rand.Read(key[:]) @@ -89,14 +89,10 @@ func BenchmarkObfs(b *testing.B) { payloadCipher, _ := cipher.NewGCM(c) obfs := MakeObfs(key, payloadCipher) + b.SetBytes(int64(len(testFrame.Payload))) b.ResetTimer() for i := 0; i < b.N; i++ { - n, err := obfs(testFrame, obfsBuf) - if err != nil { - b.Error(err) - return - } - b.SetBytes(int64(n)) + obfs(testFrame, obfsBuf) } }) b.Run("AES128GCM", func(b *testing.B) { @@ -104,40 +100,28 @@ func BenchmarkObfs(b *testing.B) { payloadCipher, _ := cipher.NewGCM(c) obfs := MakeObfs(key, payloadCipher) + b.SetBytes(int64(len(testFrame.Payload))) b.ResetTimer() for i := 0; i < b.N; i++ { - n, err := obfs(testFrame, obfsBuf) - if err != nil { - b.Error(err) - return - } - b.SetBytes(int64(n)) + obfs(testFrame, obfsBuf) } }) b.Run("plain", func(b *testing.B) { obfs := MakeObfs(key, nil) + b.SetBytes(int64(len(testFrame.Payload))) b.ResetTimer() for i := 0; i < b.N; i++ { - n, err := obfs(testFrame, obfsBuf) - if err != nil { - b.Error(err) - return - } - b.SetBytes(int64(n)) + obfs(testFrame, obfsBuf) } }) b.Run("chacha20Poly1305", func(b *testing.B) { payloadCipher, _ := chacha20poly1305.New(key[:16]) obfs := MakeObfs(key, payloadCipher) + b.SetBytes(int64(len(testFrame.Payload))) b.ResetTimer() for i := 0; i < b.N; i++ { - n, err := obfs(testFrame, obfsBuf) - if err != nil { - b.Error(err) - return - } - b.SetBytes(int64(n)) + obfs(testFrame, obfsBuf) } }) } @@ -152,7 +136,7 @@ func BenchmarkDeobfs(b *testing.B) { testPayload, } - obfsBuf := make([]byte, 2048) + obfsBuf := make([]byte, defaultSendRecvBufSize) var key [32]byte rand.Read(key[:]) @@ -164,14 +148,10 @@ func BenchmarkDeobfs(b *testing.B) { n, _ := obfs(testFrame, obfsBuf) deobfs := MakeDeobfs(key, payloadCipher) + b.SetBytes(int64(n)) b.ResetTimer() for i := 0; i < b.N; i++ { - _, err := deobfs(obfsBuf[:n]) - if err != nil { - b.Error(err) - return - } - b.SetBytes(int64(n)) + deobfs(obfsBuf[:n]) } }) b.Run("AES128GCM", func(b *testing.B) { @@ -183,13 +163,9 @@ func BenchmarkDeobfs(b *testing.B) { deobfs := MakeDeobfs(key, payloadCipher) b.ResetTimer() + b.SetBytes(int64(n)) for i := 0; i < b.N; i++ { - _, err := deobfs(obfsBuf[:n]) - if err != nil { - b.Error(err) - return - } - b.SetBytes(int64(n)) + deobfs(obfsBuf[:n]) } }) b.Run("plain", func(b *testing.B) { @@ -198,13 +174,9 @@ func BenchmarkDeobfs(b *testing.B) { deobfs := MakeDeobfs(key, nil) b.ResetTimer() + b.SetBytes(int64(n)) for i := 0; i < b.N; i++ { - _, err := deobfs(obfsBuf[:n]) - if err != nil { - b.Error(err) - return - } - b.SetBytes(int64(n)) + deobfs(obfsBuf[:n]) } }) b.Run("chacha20Poly1305", func(b *testing.B) { @@ -215,13 +187,9 @@ func BenchmarkDeobfs(b *testing.B) { deobfs := MakeDeobfs(key, payloadCipher) b.ResetTimer() + b.SetBytes(int64(n)) for i := 0; i < b.N; i++ { - _, err := deobfs(obfsBuf[:n]) - if err != nil { - b.Error(err) - return - } - b.SetBytes(int64(n)) + deobfs(obfsBuf[:n]) } }) } diff --git a/internal/multiplex/session_test.go b/internal/multiplex/session_test.go index 3af9069..f1a2f55 100644 --- a/internal/multiplex/session_test.go +++ b/internal/multiplex/session_test.go @@ -465,10 +465,10 @@ func BenchmarkRecvDataFromRemote_Ordered(b *testing.B) { sesh := MakeSession(0, seshConfigOrdered) n, _ := sesh.Obfs(f, obfsBuf) + b.SetBytes(int64(len(f.Payload))) b.ResetTimer() for i := 0; i < b.N; i++ { sesh.recvDataFromRemote(obfsBuf[:n]) - b.SetBytes(int64(n)) } }) @@ -478,10 +478,10 @@ func BenchmarkRecvDataFromRemote_Ordered(b *testing.B) { sesh := MakeSession(0, seshConfigOrdered) n, _ := sesh.Obfs(f, obfsBuf) + b.SetBytes(int64(len(f.Payload))) b.ResetTimer() for i := 0; i < b.N; i++ { sesh.recvDataFromRemote(obfsBuf[:n]) - b.SetBytes(int64(n)) } }) @@ -491,10 +491,10 @@ func BenchmarkRecvDataFromRemote_Ordered(b *testing.B) { sesh := MakeSession(0, seshConfigOrdered) n, _ := sesh.Obfs(f, obfsBuf) + b.SetBytes(int64(len(f.Payload))) b.ResetTimer() for i := 0; i < b.N; i++ { sesh.recvDataFromRemote(obfsBuf[:n]) - b.SetBytes(int64(n)) } }) } diff --git a/internal/multiplex/stream_test.go b/internal/multiplex/stream_test.go index 9e53197..9d0fa27 100644 --- a/internal/multiplex/stream_test.go +++ b/internal/multiplex/stream_test.go @@ -5,7 +5,6 @@ import ( "github.com/cbeuw/Cloak/internal/common" "io" "math/rand" - "net" "testing" "time" @@ -35,19 +34,14 @@ func BenchmarkStream_Write_Ordered(b *testing.B) { rand.Read(testData) stream, _ := sesh.OpenStream() + b.SetBytes(payloadLen) b.ResetTimer() for i := 0; i < b.N; i++ { - _, err := stream.Write(testData) - if err != nil { - b.Error( - "For", "stream write", - "got", err, - ) - } - b.SetBytes(payloadLen) + stream.Write(testData) } } +/* func BenchmarkStream_Read_Ordered(b *testing.B) { var sessionKey [32]byte rand.Read(sessionKey[:]) @@ -88,20 +82,16 @@ func BenchmarkStream_Read_Ordered(b *testing.B) { //time.Sleep(5*time.Second) // wait for buffer to fill up readBuf := make([]byte, payloadLen) + b.SetBytes(payloadLen) b.ResetTimer() for j := 0; j < b.N; j++ { - n, err := stream.Read(readBuf) - if !bytes.Equal(readBuf, testPayload) { - b.Error("paylod not equal") - } - b.SetBytes(int64(n)) - if err != nil { - b.Error(err) - } + stream.Read(readBuf) } } +*/ + func TestStream_Write(t *testing.T) { hole := connutil.Discard() var sessionKey [32]byte diff --git a/internal/multiplex/switchboard_test.go b/internal/multiplex/switchboard_test.go index 27595ba..c21de01 100644 --- a/internal/multiplex/switchboard_test.go +++ b/internal/multiplex/switchboard_test.go @@ -76,14 +76,10 @@ func BenchmarkSwitchboard_Send(b *testing.B) { } data := make([]byte, 1000) rand.Read(data) + b.SetBytes(int64(len(data))) b.ResetTimer() for i := 0; i < b.N; i++ { - n, err := sesh.sb.send(data, &connId) - if err != nil { - b.Error(err) - return - } - b.SetBytes(int64(n)) + sesh.sb.send(data, &connId) } } diff --git a/internal/test/integration_test.go b/internal/test/integration_test.go index 797bb78..da515ee 100644 --- a/internal/test/integration_test.go +++ b/internal/test/integration_test.go @@ -393,10 +393,10 @@ func BenchmarkThroughput(b *testing.B) { clientConn, _ := pxyClientD.Dial("", "") readBuf := make([]byte, bufSize) clientConn.Write([]byte{1}) // to make server accept + b.SetBytes(bufSize) b.ResetTimer() for i := 0; i < b.N; i++ { - n, _ := clientConn.Read(readBuf) - b.SetBytes(int64(n)) + clientConn.Read(readBuf) more <- 0 } }) diff --git a/internal/util/util_test.go b/internal/util/util_test.go index 7affb6b..f340281 100644 --- a/internal/util/util_test.go +++ b/internal/util/util_test.go @@ -1,12 +1,6 @@ package util -import ( - "io" - "io/ioutil" - "math/rand" - "testing" -) - +/* func BenchmarkPipe(b *testing.B) { reader := rand.New(rand.NewSource(42)) buf := make([]byte, 16380) @@ -24,3 +18,6 @@ func BenchmarkPipe(b *testing.B) { b.SetBytes(int64(n)) } } + + +*/