Archives
/
Cloak
mirror of https://github.com/cbeuw/Cloak
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Correct usages of b.SetBytes

Browse Source
pull/110/head
Andy Wang 4 years ago
parent e03080d3ba
commit 97eb6aa096
7 changed files with 38 additions and 94 deletions
Show Stats Download Patch File Download Diff File

11
internal/multiplex/bufferedPipe_test.go
Unescape Escape View File

@ -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)
}
}

68
internal/multiplex/obfs_test.go
Unescape Escape View File

@ -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])
}
})
}

6
internal/multiplex/session_test.go
Unescape Escape View File

@ -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))
}
})
}

24
internal/multiplex/stream_test.go
Unescape Escape View File

@ -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

8
internal/multiplex/switchboard_test.go
Unescape Escape View File

@ -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)
}
}

4
internal/test/integration_test.go
Unescape Escape View File

@ -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
}
})

11
internal/util/util_test.go
Unescape Escape View File

@ -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))
}
}
*/

Write Preview
Loading…
Cancel
Save