grpc
/
grpc-go
mirror of https://github.com/grpc/grpc-go.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Reset lastResetTime after merging histograms

This commit is contained in:
Menghan Li 2016-05-12 10:44:43 -07:00
parent 0dc39fe27f
commit 7bb7ec5e30
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
benchmark/worker/benchmark_client.go
View File

@ -330,12 +330,10 @@ func (bc *benchmarkClient) doCloseLoopStreaming(conns []*grpc.ClientConn, rpcCou
// getStats returns the stats for benchmark client. // getStats returns the stats for benchmark client.
// It resets lastResetTime and all histograms if argument reset is true. // It resets lastResetTime and all histograms if argument reset is true.
func (bc *benchmarkClient) getStats(reset bool) *testpb.ClientStats { func (bc *benchmarkClient) getStats(reset bool) *testpb.ClientStats {
timeElapsed := time.Since(bc.lastResetTime).Seconds() var timeElapsed float64
mergedHistogram := stats.NewHistogram(bc.histogramOptions) mergedHistogram := stats.NewHistogram(bc.histogramOptions)
if reset { if reset {
bc.lastResetTime = time.Now()
// Merging histogram may take some time. // Merging histogram may take some time.
// Put all histograms aside and merge later. // Put all histograms aside and merge later.
toMerge := make([]*stats.Histogram, len(bc.histograms)) toMerge := make([]*stats.Histogram, len(bc.histograms))
@ -349,6 +347,9 @@ func (bc *benchmarkClient) getStats(reset bool) *testpb.ClientStats {
for i := 0; i < len(toMerge); i++ { for i := 0; i < len(toMerge); i++ {
mergedHistogram.Merge(toMerge[i]) mergedHistogram.Merge(toMerge[i])
} }
timeElapsed = time.Since(bc.lastResetTime).Seconds()
bc.lastResetTime = time.Now()
} else { } else {
// Merge only, not reset. // Merge only, not reset.
for i := range bc.histograms { for i := range bc.histograms {
@ -356,6 +357,7 @@ func (bc *benchmarkClient) getStats(reset bool) *testpb.ClientStats {
mergedHistogram.Merge(bc.histograms[i]) mergedHistogram.Merge(bc.histograms[i])
bc.mutexes[i].Unlock() bc.mutexes[i].Unlock()
} }
timeElapsed = time.Since(bc.lastResetTime).Seconds()
} }
b := make([]uint32, len(mergedHistogram.Buckets)) b := make([]uint32, len(mergedHistogram.Buckets))