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

Simplify make() (gosimple)

Browse Source 
This fixes:
benchmark/worker/benchmark_client.go:151:36: should use make([]*grpc.ClientConn, connCount) instead (S1019)
benchmark/worker/benchmark_client.go:231:47: should use make([]lockingHistogram, rpcCountPerConn * len(conns)) instead (S1019)
benchmark/worker/benchmark_client.go:343:39: should use make([]*stats.Histogram, len(bc.lockingHistograms)) instead (S1019)
benchmark/worker/benchmark_client.go:369:22: should use make([]uint32, len(mergedHistogram.Buckets)) instead (S1019)
encoding/encoding.go:85:47: should use make(map[string]Codec) instead (S1019)
proxy_test.go:116:26: should use make([]byte, len(msg)) instead (S1019)
This commit is contained in:
Karsten Weiss
2018-04-15 13:02:09 +02:00
parent 749a0db289
commit 4d9544a0fd
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
benchmark/worker/benchmark_client.go
View File

@ -148,7 +148,7 @@ func createConns(config *testpb.ClientConfig) ([]*grpc.ClientConn, func(), error
// Create connections. // Create connections.
connCount := int(config.ClientChannels) connCount := int(config.ClientChannels)
conns := make([]*grpc.ClientConn, connCount, connCount) conns := make([]*grpc.ClientConn, connCount)
for connIndex := 0; connIndex < connCount; connIndex++ { for connIndex := 0; connIndex < connCount; connIndex++ {
conns[connIndex] = benchmark.NewClientConn(config.ServerTargets[connIndex%len(config.ServerTargets)], opts...) conns[connIndex] = benchmark.NewClientConn(config.ServerTargets[connIndex%len(config.ServerTargets)], opts...)
} }
@ -228,7 +228,7 @@ func startBenchmarkClient(config *testpb.ClientConfig) (*benchmarkClient, error)
BaseBucketSize: (1 + config.HistogramParams.Resolution), BaseBucketSize: (1 + config.HistogramParams.Resolution),
MinValue: 0, MinValue: 0,
}, },
lockingHistograms: make([]lockingHistogram, rpcCountPerConn*len(conns), rpcCountPerConn*len(conns)), lockingHistograms: make([]lockingHistogram, rpcCountPerConn*len(conns)),
stop: make(chan bool), stop: make(chan bool),
lastResetTime: time.Now(), lastResetTime: time.Now(),
@ -340,7 +340,7 @@ func (bc *benchmarkClient) getStats(reset bool) *testpb.ClientStats {
if reset { if reset {
// 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.lockingHistograms), len(bc.lockingHistograms)) toMerge := make([]*stats.Histogram, len(bc.lockingHistograms))
for i := range bc.lockingHistograms { for i := range bc.lockingHistograms {
toMerge[i] = bc.lockingHistograms[i].swap(stats.NewHistogram(bc.histogramOptions)) toMerge[i] = bc.lockingHistograms[i].swap(stats.NewHistogram(bc.histogramOptions))
} }
@ -366,7 +366,7 @@ func (bc *benchmarkClient) getStats(reset bool) *testpb.ClientStats {
uTimeElapsed, sTimeElapsed = cpuTimeDiff(bc.rusageLastReset, latestRusage) uTimeElapsed, sTimeElapsed = cpuTimeDiff(bc.rusageLastReset, latestRusage)
} }
b := make([]uint32, len(mergedHistogram.Buckets), len(mergedHistogram.Buckets)) b := make([]uint32, len(mergedHistogram.Buckets))
for i, v := range mergedHistogram.Buckets { for i, v := range mergedHistogram.Buckets {
b[i] = uint32(v.Count) b[i] = uint32(v.Count)
} }

2
encoding/encoding.go
View File

@ -82,7 +82,7 @@ type Codec interface {
Name() string Name() string
} }
var registeredCodecs = make(map[string]Codec, 0) var registeredCodecs = make(map[string]Codec)
// RegisterCodec registers the provided Codec for use with all gRPC clients and // RegisterCodec registers the provided Codec for use with all gRPC clients and
// servers. // servers.

2
proxy_test.go
View File

@ -113,7 +113,7 @@ func TestHTTPConnect(t *testing.T) {
} }
msg := []byte{4, 3, 5, 2} msg := []byte{4, 3, 5, 2}
recvBuf := make([]byte, len(msg), len(msg)) recvBuf := make([]byte, len(msg))
done := make(chan struct{}) done := make(chan struct{})
go func() { go func() {
in, err := blis.Accept() in, err := blis.Accept()