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

benchmark: don't stop timer until after workers are done (#1407)

Browse Source
This commit is contained in:
dfawley
2017-07-31 11:36:28 -07:00
committed by GitHub
parent 7c7afa0318
commit 4c7bb72916
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
benchmark/benchmark.go
View File

@ -261,7 +261,6 @@ func NewClientConn(addr string, opts ...grpc.DialOption) *grpc.ClientConn {
func runUnary(b *testing.B, benchFeatures Features) { func runUnary(b *testing.B, benchFeatures Features) {
s := stats.AddStats(b, 38) s := stats.AddStats(b, 38)
nw := &latency.Network{Kbps: benchFeatures.Kbps, Latency: benchFeatures.Latency, MTU: benchFeatures.Mtu} nw := &latency.Network{Kbps: benchFeatures.Kbps, Latency: benchFeatures.Latency, MTU: benchFeatures.Mtu}
b.StopTimer()
target, stopper := StartServer(ServerInfo{Addr: "localhost:0", Type: "protobuf", Network: nw}, grpc.MaxConcurrentStreams(uint32(benchFeatures.MaxConcurrentCalls+1))) target, stopper := StartServer(ServerInfo{Addr: "localhost:0", Type: "protobuf", Network: nw}, grpc.MaxConcurrentStreams(uint32(benchFeatures.MaxConcurrentCalls+1)))
defer stopper() defer stopper()
conn := NewClientConn( conn := NewClientConn(
@ -297,20 +296,19 @@ func runUnary(b *testing.B, benchFeatures Features) {
wg.Done() wg.Done()
}() }()
} }
b.StartTimer() b.ResetTimer()
for i := 0; i < b.N; i++ { for i := 0; i < b.N; i++ {
ch <- i ch <- i
} }
b.StopTimer()
close(ch) close(ch)
wg.Wait() wg.Wait()
b.StopTimer()
conn.Close() conn.Close()
} }
func runStream(b *testing.B, benchFeatures Features) { func runStream(b *testing.B, benchFeatures Features) {
s := stats.AddStats(b, 38) s := stats.AddStats(b, 38)
nw := &latency.Network{Kbps: benchFeatures.Kbps, Latency: benchFeatures.Latency, MTU: benchFeatures.Mtu} nw := &latency.Network{Kbps: benchFeatures.Kbps, Latency: benchFeatures.Latency, MTU: benchFeatures.Mtu}
b.StopTimer()
target, stopper := StartServer(ServerInfo{Addr: "localhost:0", Type: "protobuf", Network: nw}, grpc.MaxConcurrentStreams(uint32(benchFeatures.MaxConcurrentCalls+1))) target, stopper := StartServer(ServerInfo{Addr: "localhost:0", Type: "protobuf", Network: nw}, grpc.MaxConcurrentStreams(uint32(benchFeatures.MaxConcurrentCalls+1)))
defer stopper() defer stopper()
conn := NewClientConn( conn := NewClientConn(
@ -355,13 +353,13 @@ func runStream(b *testing.B, benchFeatures Features) {
wg.Done() wg.Done()
}() }()
} }
b.StartTimer() b.ResetTimer()
for i := 0; i < b.N; i++ { for i := 0; i < b.N; i++ {
ch <- struct{}{} ch <- struct{}{}
} }
b.StopTimer()
close(ch) close(ch)
wg.Wait() wg.Wait()
b.StopTimer()
conn.Close() conn.Close()
} }
func unaryCaller(client testpb.BenchmarkServiceClient, reqSize, respSize int) { func unaryCaller(client testpb.BenchmarkServiceClient, reqSize, respSize int) {