opensource/grpc-go
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

codec_benchmark_test: fix racy unmarshal behavior and make some cleanups (#1642)

Browse Source
This commit is contained in:
dfawley
2017-11-02 13:42:21 -07:00
committed by GitHub
parent ac0ac2b80e
commit 60f1f6aa07
1 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
codec_benchmark_test.go
View File

@ -28,7 +28,7 @@ import (
"google.golang.org/grpc/test/codec_perf" "google.golang.org/grpc/test/codec_perf"
) )
func setupBenchmarkProtoCodecInputs(b *testing.B, payloadBaseSize uint32) []proto.Message { func setupBenchmarkProtoCodecInputs(payloadBaseSize uint32) []proto.Message {
payloadBase := make([]byte, payloadBaseSize) payloadBase := make([]byte, payloadBaseSize)
// arbitrary byte slices // arbitrary byte slices
payloadSuffixes := [][]byte{ payloadSuffixes := [][]byte{
@ -59,23 +59,21 @@ func BenchmarkProtoCodec(b *testing.B) {
payloadBaseSizes = append(payloadBaseSizes, 1<<i) payloadBaseSizes = append(payloadBaseSizes, 1<<i)
} }
// range of SetParallelism // range of SetParallelism
parallelisms := make([]uint32, 0) parallelisms := make([]int, 0)
for i := uint32(0); i <= 16; i += 4 { for i := uint32(0); i <= 16; i += 4 {
parallelisms = append(parallelisms, 1<<i) parallelisms = append(parallelisms, int(1<<i))
} }
for _, s := range payloadBaseSizes { for _, s := range payloadBaseSizes {
for _, p := range parallelisms { for _, p := range parallelisms {
func(parallelism int, payloadBaseSize uint32) { protoStructs := setupBenchmarkProtoCodecInputs(s)
protoStructs := setupBenchmarkProtoCodecInputs(b, payloadBaseSize) name := fmt.Sprintf("MinPayloadSize:%v/SetParallelism(%v)", s, p)
name := fmt.Sprintf("MinPayloadSize:%v/SetParallelism(%v)", payloadBaseSize, parallelism)
b.Run(name, func(b *testing.B) { b.Run(name, func(b *testing.B) {
codec := &protoCodec{} codec := &protoCodec{}
b.SetParallelism(parallelism) b.SetParallelism(p)
b.RunParallel(func(pb *testing.PB) { b.RunParallel(func(pb *testing.PB) {
benchmarkProtoCodec(codec, protoStructs, pb, b) benchmarkProtoCodec(codec, protoStructs, pb, b)
}) })
}) })
}(int(p), s)
} }
} }
} }
@ -94,7 +92,8 @@ func fastMarshalAndUnmarshal(protoCodec Codec, protoStruct proto.Message, b *tes
if err != nil { if err != nil {
b.Errorf("protoCodec.Marshal(_) returned an error") b.Errorf("protoCodec.Marshal(_) returned an error")
} }
if err := protoCodec.Unmarshal(marshaledBytes, protoStruct); err != nil { res := codec_perf.Buffer{}
if err := protoCodec.Unmarshal(marshaledBytes, &res); err != nil {
b.Errorf("protoCodec.Unmarshal(_) returned an error") b.Errorf("protoCodec.Unmarshal(_) returned an error")
} }
} }