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

Fix comments and remove useless WaitGroup

Browse Source
This commit is contained in:
Menghan Li
2016-05-03 18:28:06 -07:00
parent d34f891713
commit a0ea2d2050
2 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
benchmark/worker/benchmark_client.go
View File

@ -90,6 +90,8 @@ func setupClientEnv(config *testpb.ClientConfig) {
}
}
// createConns creates connections according to given config.
// It returns a slice of connections created, the function to close all connections, and errors if any.
func createConns(config *testpb.ClientConfig) ([]*grpc.ClientConn, func(), error) {
var opts []grpc.DialOption
@ -112,7 +114,7 @@ func createConns(config *testpb.ClientConfig) ([]*grpc.ClientConn, func(), error
opts = append(opts, grpc.WithInsecure())
}
// Use byteBufCodec is required.
// Use byteBufCodec if it is required.
if config.PayloadConfig != nil {
switch config.PayloadConfig.Payload.(type) {
case *testpb.PayloadConfig_BytebufParams:
@ -123,7 +125,7 @@ func createConns(config *testpb.ClientConfig) ([]*grpc.ClientConn, func(), error
}
}
// Create connestions.
// Create connections.
connCount := int(config.ClientChannels)
conns := make([]*grpc.ClientConn, connCount)
for connIndex := 0; connIndex < connCount; connIndex++ {
@ -208,7 +210,7 @@ func startBenchmarkClient(config *testpb.ClientConfig) (*benchmarkClient, error)
err = performRPCs(config, conns, &bc)
if err != nil {
// Close all conns if failed to performRPCs.
// Close all connections if performRPCs failed.
closeConns()
return nil, err
}
@ -221,15 +223,12 @@ func (bc *benchmarkClient) doCloseLoopUnary(conns []*grpc.ClientConn, rpcCountPe
client := testpb.NewBenchmarkServiceClient(conn)
// For each connection, create rpcCountPerConn goroutines to do rpc.
// Close this connection after all goroutines finish.
var wg sync.WaitGroup
wg.Add(rpcCountPerConn)
for j := 0; j < rpcCountPerConn; j++ {
go func() {
// TODO: do warm up if necessary.
// Now relying on worker client to reserve time to do warm up.
// The worker client needs to wait for some time after client is created,
// before starting benchmark.
defer wg.Done()
done := make(chan bool)
for {
go func() {
@ -271,8 +270,6 @@ func (bc *benchmarkClient) doCloseLoopStreaming(conns []*grpc.ClientConn, rpcCou
for _, conn := range conns {
// For each connection, create rpcCountPerConn goroutines to do rpc.
// Close this connection after all goroutines finish.
var wg sync.WaitGroup
wg.Add(rpcCountPerConn)
for j := 0; j < rpcCountPerConn; j++ {
c := testpb.NewBenchmarkServiceClient(conn)
stream, err := c.StreamingCall(context.Background())
@ -285,7 +282,6 @@ func (bc *benchmarkClient) doCloseLoopStreaming(conns []*grpc.ClientConn, rpcCou
// Now relying on worker client to reserve time to do warm up.
// The worker client needs to wait for some time after client is created,
// before starting benchmark.
defer wg.Done()
done := make(chan bool)
for {
go func() {

4
benchmark/worker/main.go
View File

@ -40,6 +40,7 @@ import (
"net"
"runtime"
"strconv"
"time"
"golang.org/x/net/context"
"google.golang.org/grpc"
@ -207,7 +208,7 @@ func (s *workerServer) CoreCount(ctx context.Context, in *testpb.CoreRequest) (*
func (s *workerServer) QuitWorker(ctx context.Context, in *testpb.Void) (*testpb.Void, error) {
grpclog.Printf("quiting worker")
defer func() { s.stop <- true }()
s.stop <- true
return &testpb.Void{}, nil
}
@ -228,6 +229,7 @@ func main() {
go func() {
<-stop
time.Sleep(time.Second)
s.Stop()
}()