Fresh dep ensure

vendor/google.golang.org/grpc/benchmark/benchmain/main.go

@@ -66,6 +66,7 @@ import (
 	"google.golang.org/grpc/benchmark/latency"
 	"google.golang.org/grpc/benchmark/stats"
 	"google.golang.org/grpc/grpclog"
+	"google.golang.org/grpc/internal/channelz"
 	"google.golang.org/grpc/test/bufconn"
 )
 
@@ -113,14 +114,14 @@ var (
 )
 
 func unaryBenchmark(startTimer func(), stopTimer func(int32), benchFeatures stats.Features, benchtime time.Duration, s *stats.Stats) {
-	caller, close := makeFuncUnary(benchFeatures)
-	defer close()
+	caller, cleanup := makeFuncUnary(benchFeatures)
+	defer cleanup()
 	runBenchmark(caller, startTimer, stopTimer, benchFeatures, benchtime, s)
 }
 
 func streamBenchmark(startTimer func(), stopTimer func(int32), benchFeatures stats.Features, benchtime time.Duration, s *stats.Stats) {
-	caller, close := makeFuncStream(benchFeatures)
-	defer close()
+	caller, cleanup := makeFuncStream(benchFeatures)
+	defer cleanup()
 	runBenchmark(caller, startTimer, stopTimer, benchFeatures, benchtime, s)
 }
 
@@ -452,7 +453,7 @@ func main() {
 
 		grpc.EnableTracing = enableTrace[featuresPos[0]]
 		if enableChannelz[featuresPos[8]] {
-			grpc.RegisterChannelz()
+			channelz.TurnOn()
 		}
 		if runMode[0] {
 			unaryBenchmark(startTimer, stopTimer, benchFeature, benchtime, s)

vendor/google.golang.org/grpc/benchmark/client/main.go

@@ -28,12 +28,12 @@ import (
 	"time"
 
 	"golang.org/x/net/context"
-	"golang.org/x/sys/unix"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/benchmark"
 	testpb "google.golang.org/grpc/benchmark/grpc_testing"
 	"google.golang.org/grpc/benchmark/stats"
 	"google.golang.org/grpc/grpclog"
+	"google.golang.org/grpc/internal/syscall"
 )
 
 var (
@@ -82,12 +82,12 @@ func main() {
 	}
 	defer cf.Close()
 	pprof.StartCPUProfile(cf)
-	cpuBeg := getCPUTime()
+	cpuBeg := syscall.GetCPUTime()
 	for _, cc := range ccs {
 		runWithConn(cc, req, warmDeadline, endDeadline)
 	}
 	wg.Wait()
-	cpu := time.Duration(getCPUTime() - cpuBeg)
+	cpu := time.Duration(syscall.GetCPUTime() - cpuBeg)
 	pprof.StopCPUProfile()
 	mf, err := os.Create("/tmp/" + *testName + ".mem")
 	if err != nil {
@@ -185,11 +185,3 @@ func median(percentile float64, h *stats.Histogram) int64 {
 	}
 	panic("should have found a bound")
 }
-
-func getCPUTime() int64 {
-	var ts unix.Timespec
-	if err := unix.ClockGettime(unix.CLOCK_PROCESS_CPUTIME_ID, &ts); err != nil {
-		grpclog.Fatal(err)
-	}
-	return ts.Nano()
-}

vendor/google.golang.org/grpc/benchmark/grpc_testing/control.pb.go

@@ -337,24 +337,32 @@ type isLoadParams_Load interface {
 type LoadParams_ClosedLoop struct {
 	ClosedLoop *ClosedLoopParams `protobuf:"bytes,1,opt,name=closed_loop,json=closedLoop,proto3,oneof"`
 }
+
 type LoadParams_Poisson struct {
 	Poisson *PoissonParams `protobuf:"bytes,2,opt,name=poisson,proto3,oneof"`
 }
+
 type LoadParams_Uniform struct {
 	Uniform *UniformParams `protobuf:"bytes,3,opt,name=uniform,proto3,oneof"`
 }
+
 type LoadParams_Determ struct {
 	Determ *DeterministicParams `protobuf:"bytes,4,opt,name=determ,proto3,oneof"`
 }
+
 type LoadParams_Pareto struct {
 	Pareto *ParetoParams `protobuf:"bytes,5,opt,name=pareto,proto3,oneof"`
 }
 
 func (*LoadParams_ClosedLoop) isLoadParams_Load() {}
-func (*LoadParams_Poisson) isLoadParams_Load()    {}
-func (*LoadParams_Uniform) isLoadParams_Load()    {}
-func (*LoadParams_Determ) isLoadParams_Load()     {}
-func (*LoadParams_Pareto) isLoadParams_Load()     {}
+
+func (*LoadParams_Poisson) isLoadParams_Load() {}
+
+func (*LoadParams_Uniform) isLoadParams_Load() {}
+
+func (*LoadParams_Determ) isLoadParams_Load() {}
+
+func (*LoadParams_Pareto) isLoadParams_Load() {}
 
 func (m *LoadParams) GetLoad() isLoadParams_Load {
 	if m != nil {
@@ -829,12 +837,14 @@ type isClientArgs_Argtype interface {
 type ClientArgs_Setup struct {
 	Setup *ClientConfig `protobuf:"bytes,1,opt,name=setup,proto3,oneof"`
 }
+
 type ClientArgs_Mark struct {
 	Mark *Mark `protobuf:"bytes,2,opt,name=mark,proto3,oneof"`
 }
 
 func (*ClientArgs_Setup) isClientArgs_Argtype() {}
-func (*ClientArgs_Mark) isClientArgs_Argtype()  {}
+
+func (*ClientArgs_Mark) isClientArgs_Argtype() {}
 
 func (m *ClientArgs) GetArgtype() isClientArgs_Argtype {
 	if m != nil {
@@ -1063,12 +1073,14 @@ type isServerArgs_Argtype interface {
 type ServerArgs_Setup struct {
 	Setup *ServerConfig `protobuf:"bytes,1,opt,name=setup,proto3,oneof"`
 }
+
 type ServerArgs_Mark struct {
 	Mark *Mark `protobuf:"bytes,2,opt,name=mark,proto3,oneof"`
 }
 
 func (*ServerArgs_Setup) isServerArgs_Argtype() {}
-func (*ServerArgs_Mark) isServerArgs_Argtype()  {}
+
+func (*ServerArgs_Mark) isServerArgs_Argtype() {}
 
 func (m *ServerArgs) GetArgtype() isServerArgs_Argtype {
 	if m != nil {

vendor/google.golang.org/grpc/benchmark/grpc_testing/payloads.pb.go

@@ -182,15 +182,19 @@ type isPayloadConfig_Payload interface {
 type PayloadConfig_BytebufParams struct {
 	BytebufParams *ByteBufferParams `protobuf:"bytes,1,opt,name=bytebuf_params,json=bytebufParams,proto3,oneof"`
 }
+
 type PayloadConfig_SimpleParams struct {
 	SimpleParams *SimpleProtoParams `protobuf:"bytes,2,opt,name=simple_params,json=simpleParams,proto3,oneof"`
 }
+
 type PayloadConfig_ComplexParams struct {
 	ComplexParams *ComplexProtoParams `protobuf:"bytes,3,opt,name=complex_params,json=complexParams,proto3,oneof"`
 }
 
 func (*PayloadConfig_BytebufParams) isPayloadConfig_Payload() {}
-func (*PayloadConfig_SimpleParams) isPayloadConfig_Payload()  {}
+
+func (*PayloadConfig_SimpleParams) isPayloadConfig_Payload() {}
+
 func (*PayloadConfig_ComplexParams) isPayloadConfig_Payload() {}
 
 func (m *PayloadConfig) GetPayload() isPayloadConfig_Payload {

vendor/google.golang.org/grpc/benchmark/run_bench.sh

@@ -72,7 +72,7 @@ run(){
     ${out_dir}/client --port=${port} --d=${dur} --w=${warmup} --r=${nr} --c=${nc} --req=${req_sz} --resp=${resp_sz} --rpc_type=${r_type}  --test_name="client_"${test_name}
     client_status=$(echo $?)
 
-    kill ${server_pid}
+    kill -INT ${server_pid}
     wait ${server_pid}
 
     if [ ${client_status} == 0 ]; then

vendor/google.golang.org/grpc/benchmark/server/main.go

@@ -27,12 +27,11 @@ import (
 	"os/signal"
 	"runtime"
 	"runtime/pprof"
-	"syscall"
 	"time"
 
-	"golang.org/x/sys/unix"
 	"google.golang.org/grpc/benchmark"
 	"google.golang.org/grpc/grpclog"
+	"google.golang.org/grpc/internal/syscall"
 )
 
 var (
@@ -57,14 +56,14 @@ func main() {
 	}
 	defer cf.Close()
 	pprof.StartCPUProfile(cf)
-	cpuBeg := getCPUTime()
+	cpuBeg := syscall.GetCPUTime()
 	// Launch server in a separate goroutine.
 	stop := benchmark.StartServer(benchmark.ServerInfo{Type: "protobuf", Listener: lis})
 	// Wait on OS terminate signal.
 	ch := make(chan os.Signal, 1)
-	signal.Notify(ch, syscall.SIGTERM)
+	signal.Notify(ch, os.Interrupt)
 	<-ch
-	cpu := time.Duration(getCPUTime() - cpuBeg)
+	cpu := time.Duration(syscall.GetCPUTime() - cpuBeg)
 	stop()
 	pprof.StopCPUProfile()
 	mf, err := os.Create("/tmp/" + *testName + ".mem")
@@ -80,11 +79,3 @@ func main() {
 	fmt.Println("Server CPU profile:", cf.Name())
 	fmt.Println("Server Mem Profile:", mf.Name())
 }
-
-func getCPUTime() int64 {
-	var ts unix.Timespec
-	if err := unix.ClockGettime(unix.CLOCK_PROCESS_CPUTIME_ID, &ts); err != nil {
-		grpclog.Fatal(err)
-	}
-	return ts.Nano()
-}

vendor/google.golang.org/grpc/benchmark/worker/benchmark_client.go

@@ -23,7 +23,6 @@ import (
 	"math"
 	"runtime"
 	"sync"
-	"syscall"
 	"time"
 
 	"golang.org/x/net/context"
@@ -34,6 +33,7 @@ import (
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/credentials"
 	"google.golang.org/grpc/grpclog"
+	"google.golang.org/grpc/internal/syscall"
 	"google.golang.org/grpc/status"
 	"google.golang.org/grpc/testdata"
 )
@@ -51,12 +51,12 @@ func (h *lockingHistogram) add(value int64) {
 	h.histogram.Add(value)
 }
 
-// swap sets h.histogram to new, and returns its old value.
-func (h *lockingHistogram) swap(new *stats.Histogram) *stats.Histogram {
+// swap sets h.histogram to o and returns its old value.
+func (h *lockingHistogram) swap(o *stats.Histogram) *stats.Histogram {
 	h.mu.Lock()
 	defer h.mu.Unlock()
 	old := h.histogram
-	h.histogram = new
+	h.histogram = o
 	return old
 }
 
@@ -217,9 +217,6 @@ func startBenchmarkClient(config *testpb.ClientConfig) (*benchmarkClient, error)
 		return nil, err
 	}
 
-	rusage := new(syscall.Rusage)
-	syscall.Getrusage(syscall.RUSAGE_SELF, rusage)
-
 	rpcCountPerConn := int(config.OutstandingRpcsPerChannel)
 	bc := &benchmarkClient{
 		histogramOptions: stats.HistogramOptions{
@@ -233,7 +230,7 @@ func startBenchmarkClient(config *testpb.ClientConfig) (*benchmarkClient, error)
 		stop:            make(chan bool),
 		lastResetTime:   time.Now(),
 		closeConns:      closeConns,
-		rusageLastReset: rusage,
+		rusageLastReset: syscall.GetRusage(),
 	}
 
 	if err = performRPCs(config, conns, bc); err != nil {
@@ -335,7 +332,6 @@ func (bc *benchmarkClient) doCloseLoopStreaming(conns []*grpc.ClientConn, rpcCou
 func (bc *benchmarkClient) getStats(reset bool) *testpb.ClientStats {
 	var wallTimeElapsed, uTimeElapsed, sTimeElapsed float64
 	mergedHistogram := stats.NewHistogram(bc.histogramOptions)
-	latestRusage := new(syscall.Rusage)
 
 	if reset {
 		// Merging histogram may take some time.
@@ -350,8 +346,8 @@ func (bc *benchmarkClient) getStats(reset bool) *testpb.ClientStats {
 		}
 
 		wallTimeElapsed = time.Since(bc.lastResetTime).Seconds()
-		syscall.Getrusage(syscall.RUSAGE_SELF, latestRusage)
-		uTimeElapsed, sTimeElapsed = cpuTimeDiff(bc.rusageLastReset, latestRusage)
+		latestRusage := syscall.GetRusage()
+		uTimeElapsed, sTimeElapsed = syscall.CPUTimeDiff(bc.rusageLastReset, latestRusage)
 
 		bc.rusageLastReset = latestRusage
 		bc.lastResetTime = time.Now()
@@ -362,8 +358,7 @@ func (bc *benchmarkClient) getStats(reset bool) *testpb.ClientStats {
 		}
 
 		wallTimeElapsed = time.Since(bc.lastResetTime).Seconds()
-		syscall.Getrusage(syscall.RUSAGE_SELF, latestRusage)
-		uTimeElapsed, sTimeElapsed = cpuTimeDiff(bc.rusageLastReset, latestRusage)
+		uTimeElapsed, sTimeElapsed = syscall.CPUTimeDiff(bc.rusageLastReset, syscall.GetRusage())
 	}
 
 	b := make([]uint32, len(mergedHistogram.Buckets))

vendor/google.golang.org/grpc/benchmark/worker/benchmark_server.go

@@ -26,7 +26,6 @@ import (
 	"strconv"
 	"strings"
 	"sync"
-	"syscall"
 	"time"
 
 	"google.golang.org/grpc"
@@ -35,6 +34,7 @@ import (
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/credentials"
 	"google.golang.org/grpc/grpclog"
+	"google.golang.org/grpc/internal/syscall"
 	"google.golang.org/grpc/status"
 	"google.golang.org/grpc/testdata"
 )
@@ -154,15 +154,12 @@ func startBenchmarkServer(config *testpb.ServerConfig, serverPort int) (*benchma
 		grpclog.Fatalf("failed to get port number from server address: %v", err)
 	}
 
-	rusage := new(syscall.Rusage)
-	syscall.Getrusage(syscall.RUSAGE_SELF, rusage)
-
 	return &benchmarkServer{
 		port:            p,
 		cores:           numOfCores,
 		closeFunc:       closeFunc,
 		lastResetTime:   time.Now(),
-		rusageLastReset: rusage,
+		rusageLastReset: syscall.GetRusage(),
 	}, nil
 }
 
@@ -172,9 +169,8 @@ func (bs *benchmarkServer) getStats(reset bool) *testpb.ServerStats {
 	bs.mu.RLock()
 	defer bs.mu.RUnlock()
 	wallTimeElapsed := time.Since(bs.lastResetTime).Seconds()
-	rusageLatest := new(syscall.Rusage)
-	syscall.Getrusage(syscall.RUSAGE_SELF, rusageLatest)
-	uTimeElapsed, sTimeElapsed := cpuTimeDiff(bs.rusageLastReset, rusageLatest)
+	rusageLatest := syscall.GetRusage()
+	uTimeElapsed, sTimeElapsed := syscall.CPUTimeDiff(bs.rusageLastReset, rusageLatest)
 
 	if reset {
 		bs.lastResetTime = time.Now()

vendor/google.golang.org/grpc/benchmark/worker/util.go

@@ -1,35 +0,0 @@
-/*
- *
- * Copyright 2016 gRPC authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package main
-
-import "syscall"
-
-func cpuTimeDiff(first *syscall.Rusage, latest *syscall.Rusage) (float64, float64) {
-	var (
-		utimeDiffs  = latest.Utime.Sec - first.Utime.Sec
-		utimeDiffus = latest.Utime.Usec - first.Utime.Usec
-		stimeDiffs  = latest.Stime.Sec - first.Stime.Sec
-		stimeDiffus = latest.Stime.Usec - first.Stime.Usec
-	)
-
-	uTimeElapsed := float64(utimeDiffs) + float64(utimeDiffus)*1.0e-6
-	sTimeElapsed := float64(stimeDiffs) + float64(stimeDiffus)*1.0e-6
-
-	return uTimeElapsed, sTimeElapsed
-}