Fix Benchmarks

Author: oxzi

examples/endpoint/endpoint_test.go

@@ -53,20 +53,24 @@ func TestEndpoint(t *testing.T) {
 func BenchmarkEndpoint(b *testing.B) {
 	for _, test := range endpointTests {
 		b.Run(fmt.Sprintf("marshal-%s", test.eid), func(b *testing.B) {
-			e := newEndpointID(test.eid)
+			for i := 0; i < b.N; i++ {
+				e := newEndpointID(test.eid)
 
-			buff := new(bytes.Buffer)
-			if err := cboring.Marshal(&e, buff); err != nil {
-				b.Fatalf("Marshaling %s failed: %v", test.eid, err)
+				buff := new(bytes.Buffer)
+				if err := cboring.Marshal(&e, buff); err != nil {
+					b.Fatalf("Marshaling %s failed: %v", test.eid, err)
+				}
 			}
 		})
 
 		b.Run(fmt.Sprintf("unmarshal-%s", test.eid), func(b *testing.B) {
-			e := endpointID{}
+			for i := 0; i < b.N; i++ {
+				e := endpointID{}
 
-			buff := bytes.NewBuffer(test.cbor)
-			if err := cboring.Unmarshal(&e, buff); err != nil {
-				b.Fatalf("Unmarshaling %s failed: %v", test.eid, err)
+				buff := bytes.NewBuffer(test.cbor)
+				if err := cboring.Unmarshal(&e, buff); err != nil {
+					b.Fatalf("Unmarshaling %s failed: %v", test.eid, err)
+				}
 			}
 		})
 	}

examples/payloadblock/payload_test.go

@@ -55,30 +55,19 @@ func BenchmarkPayload(b *testing.B) {
 		rand.Seed(0)
 		rand.Read(rndData)
 
-		b.Run(fmt.Sprintf("marshal-%d", size), func(b *testing.B) {
-			// Setup a buffer, like in the unmarshaling test
-			pbTmp := newPayloadBlock(rndData)
-
-			buff := new(bytes.Buffer)
-			if err := cboring.Marshal(&pbTmp, buff); err != nil {
-				b.Fatalf("Marshaling failed: %v", err)
-			}
-
-			// Benchmark starts here
-			b.ResetTimer()
-
-			pb := payloadBlock{}
-			if err := cboring.Unmarshal(&pb, buff); err != nil {
-				b.Fatalf("Unmarshaling failed: %v", err)
-			}
-		})
-
-		b.Run(fmt.Sprintf("unmarshal-%d", size), func(b *testing.B) {
-			pb := newPayloadBlock(rndData)
-
-			buff := new(bytes.Buffer)
-			if err := cboring.Marshal(&pb, buff); err != nil {
-				b.Fatalf("Marshaling failed: %v", err)
+		b.Run(fmt.Sprintf("%d", size), func(b *testing.B) {
+			for i := 0; i < b.N; i++ {
+				pbTmp := newPayloadBlock(rndData)
+
+				buff := new(bytes.Buffer)
+				if err := cboring.Marshal(&pbTmp, buff); err != nil {
+					b.Fatalf("Marshaling failed: %v", err)
+				}
+
+				pb := payloadBlock{}
+				if err := cboring.Unmarshal(&pb, buff); err != nil {
+					b.Fatalf("Unmarshaling failed: %v", err)
+				}
 			}
 		})
 	}

strings_test.go

@@ -59,38 +59,33 @@ func BenchmarkByteString(b *testing.B) {
 		rand.Seed(0)
 		rand.Read(rndData)
 
-		b.Run(fmt.Sprintf("r%d", size), func(b *testing.B) {
-			// The benchmark will be executed in parallel. Therefore each thread
-			// needs its own buffer.
-			buff := new(bytes.Buffer)
-			WriteByteStringLen(uint64(size), buff)
-			buff.Write(rndData)
-
-			// Don't measure setup time
-			b.ResetTimer()
-
-			data, err := ReadByteString(buff)
-			if err != nil {
-				b.Fatal(err)
-			} else if len(data) != size {
-				b.Fatalf("Read wrong length %d != %d", len(data), size)
-			}
-		})
+		b.Run(fmt.Sprintf("%d", size), func(b *testing.B) {
+			for i := 0; i < b.N; i++ {
+				buff := new(bytes.Buffer)
+				if err := WriteByteString(rndData, buff); err != nil {
+					b.Fatal(err)
+				}
 
-		b.Run(fmt.Sprintf("w%d", size), func(b *testing.B) {
-			buff := new(bytes.Buffer)
-			if err := WriteByteString(rndData, buff); err != nil {
-				b.Fatal(err)
-			}
+				// Buff should contain size + CBOR's overhead amount of bytes.
+				ls := []int{size + 1, size + 2, size + 3, size + 5, size + 9}
+				lsFlag := false
+				for _, l := range ls {
+					if l == buff.Len() {
+						lsFlag = true
+						break
+					}
+				}
+				if !lsFlag {
+					b.Fatalf("Wrote wrong length %d", buff.Len())
+				}
 
-			// Buff should contain size + CBOR's overhead amount of bytes.
-			ls := []int{size + 1, size + 2, size + 3, size + 5, size + 9}
-			for _, l := range ls {
-				if l == buff.Len() {
-					return
+				data, err := ReadByteString(buff)
+				if err != nil {
+					b.Fatal(err)
+				} else if len(data) != size {
+					b.Fatalf("Read wrong length %d != %d", len(data), size)
 				}
 			}
-			b.Fatalf("Wrote wrong length %d", buff.Len())
 		})
 	}
 }