Skip to content

Commit 60f1f6a

Browse files
authored
codec_benchmark_test: fix racy unmarshal behavior and make some cleanups (grpc#1642)
1 parent ac0ac2b commit 60f1f6a

File tree

1 file changed

+13
-14
lines changed

1 file changed

+13
-14
lines changed

codec_benchmark_test.go

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import (
2828
"google.golang.org/grpc/test/codec_perf"
2929
)
3030

31-
func setupBenchmarkProtoCodecInputs(b *testing.B, payloadBaseSize uint32) []proto.Message {
31+
func setupBenchmarkProtoCodecInputs(payloadBaseSize uint32) []proto.Message {
3232
payloadBase := make([]byte, payloadBaseSize)
3333
// arbitrary byte slices
3434
payloadSuffixes := [][]byte{
@@ -59,23 +59,21 @@ func BenchmarkProtoCodec(b *testing.B) {
5959
payloadBaseSizes = append(payloadBaseSizes, 1<<i)
6060
}
6161
// range of SetParallelism
62-
parallelisms := make([]uint32, 0)
62+
parallelisms := make([]int, 0)
6363
for i := uint32(0); i <= 16; i += 4 {
64-
parallelisms = append(parallelisms, 1<<i)
64+
parallelisms = append(parallelisms, int(1<<i))
6565
}
6666
for _, s := range payloadBaseSizes {
6767
for _, p := range parallelisms {
68-
func(parallelism int, payloadBaseSize uint32) {
69-
protoStructs := setupBenchmarkProtoCodecInputs(b, payloadBaseSize)
70-
name := fmt.Sprintf("MinPayloadSize:%v/SetParallelism(%v)", payloadBaseSize, parallelism)
71-
b.Run(name, func(b *testing.B) {
72-
codec := &protoCodec{}
73-
b.SetParallelism(parallelism)
74-
b.RunParallel(func(pb *testing.PB) {
75-
benchmarkProtoCodec(codec, protoStructs, pb, b)
76-
})
68+
protoStructs := setupBenchmarkProtoCodecInputs(s)
69+
name := fmt.Sprintf("MinPayloadSize:%v/SetParallelism(%v)", s, p)
70+
b.Run(name, func(b *testing.B) {
71+
codec := &protoCodec{}
72+
b.SetParallelism(p)
73+
b.RunParallel(func(pb *testing.PB) {
74+
benchmarkProtoCodec(codec, protoStructs, pb, b)
7775
})
78-
}(int(p), s)
76+
})
7977
}
8078
}
8179
}
@@ -94,7 +92,8 @@ func fastMarshalAndUnmarshal(protoCodec Codec, protoStruct proto.Message, b *tes
9492
if err != nil {
9593
b.Errorf("protoCodec.Marshal(_) returned an error")
9694
}
97-
if err := protoCodec.Unmarshal(marshaledBytes, protoStruct); err != nil {
95+
res := codec_perf.Buffer{}
96+
if err := protoCodec.Unmarshal(marshaledBytes, &res); err != nil {
9897
b.Errorf("protoCodec.Unmarshal(_) returned an error")
9998
}
10099
}

0 commit comments

Comments
 (0)