From bb78c45e719e6b4499e942ab0380988b470bdd71 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Thu, 14 Sep 2017 02:41:13 +0200 Subject: fix benchmarks --- satp/packet_test.go | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/satp/packet_test.go b/satp/packet_test.go index 056727f..5db7828 100644 --- a/satp/packet_test.go +++ b/satp/packet_test.go @@ -33,8 +33,6 @@ package satp import ( "bytes" "math/rand" - // "reflect" - "io/ioutil" "testing" ) @@ -354,19 +352,24 @@ func TestEncryptedPacketReadWrite(t *testing.T) { // Benchmarking // +type devZero struct { +} + +func (dz *devZero) Read(data []byte) (int, error) { + return len(data), nil +} + +func (dz *devZero) Write(data []byte) (int, error) { + return len(data), nil +} + func BenchmarkPlainPacketReadFrom(b *testing.B) { - ins := []*bytes.Buffer{} - for i := 0; i < NUM_RANDOM_DATASETS; i++ { - _, payload := generateRandomTestDataPlainPacket() - ins = append(ins, bytes.NewBuffer(payload)) - } + in := &devZero{} pkt := NewPlainPacket() b.ResetTimer() for i := 0; i < b.N; i++ { - in := ins[i%len(ins)] - in.Reset() if _, err := pkt.ReadFrom(in); err != nil { b.Fatal("unexpected error:", err) } @@ -383,30 +386,25 @@ func BenchmarkPlainPacketWriteTo(b *testing.B) { } ins = append(ins, in) } + out := &devZero{} b.ResetTimer() for i := 0; i < b.N; i++ { in := ins[i%len(ins)] - if _, err := in.WriteTo(ioutil.Discard); err != nil { + if _, err := in.WriteTo(out); err != nil { b.Fatal("unexpected error:", err) } } } func BenchmarkEncryptedPacketReadFrom(b *testing.B) { - ins := []*bytes.Buffer{} - for i := 0; i < NUM_RANDOM_DATASETS; i++ { - _, data := generateRandomTestDataEncryptedPacket() - ins = append(ins, bytes.NewBuffer(data)) - } + in := &devZero{} pkt := NewEncryptedPacket() b.ResetTimer() for i := 0; i < b.N; i++ { - in := ins[i%len(ins)] - in.Reset() if _, err := pkt.ReadFrom(in); err != nil { b.Fatal("unexpected error:", err) } @@ -423,12 +421,13 @@ func BenchmarkEncryptedPacketWriteTo(b *testing.B) { } ins = append(ins, in) } + out := &devZero{} b.ResetTimer() for i := 0; i < b.N; i++ { in := ins[i%len(ins)] - if _, err := in.WriteTo(ioutil.Discard); err != nil { + if _, err := in.WriteTo(out); err != nil { b.Fatal("unexpected error:", err) } } -- cgit v1.2.3