x/ref/runtime/internal/rpc/benchmark: use context-based logging.
Change-Id: I140b04174c1f2db5cfb9a255bbb29bb59411f3f0
diff --git a/runtime/internal/rpc/benchmark/benchmark/main.go b/runtime/internal/rpc/benchmark/benchmark/main.go
index b74bd81..15bf193 100644
--- a/runtime/internal/rpc/benchmark/benchmark/main.go
+++ b/runtime/internal/rpc/benchmark/benchmark/main.go
@@ -12,9 +12,10 @@
"testing"
"time"
- "v.io/v23/context"
"v.io/x/lib/cmdline"
- "v.io/x/lib/vlog"
+
+ "v.io/v23/context"
+
"v.io/x/ref/lib/v23cmd"
_ "v.io/x/ref/runtime/factories/generic"
"v.io/x/ref/runtime/internal/rpc/benchmark/internal"
@@ -50,7 +51,7 @@
dummyB := testing.B{}
_, stop := internal.StartEchoStream(&dummyB, ctx, server, 0, chunkCntMux, payloadSizeMux, nil)
defer stop()
- vlog.Infof("Started background streaming (chunk_size=%d, payload_size=%d)", chunkCntMux, payloadSizeMux)
+ ctx.Infof("Started background streaming (chunk_size=%d, payload_size=%d)", chunkCntMux, payloadSizeMux)
}
dummyB := testing.B{}
diff --git a/runtime/internal/rpc/benchmark/benchmarkd/main.go b/runtime/internal/rpc/benchmark/benchmarkd/main.go
index e5053fd..fc5c52d 100644
--- a/runtime/internal/rpc/benchmark/benchmarkd/main.go
+++ b/runtime/internal/rpc/benchmark/benchmarkd/main.go
@@ -8,10 +8,11 @@
package main
import (
+ "v.io/x/lib/cmdline"
+
"v.io/v23"
"v.io/v23/context"
- "v.io/x/lib/cmdline"
- "v.io/x/lib/vlog"
+
"v.io/x/ref/lib/signals"
"v.io/x/ref/lib/v23cmd"
_ "v.io/x/ref/runtime/factories/roaming"
@@ -32,7 +33,7 @@
func runBenchmarkD(ctx *context.T, env *cmdline.Env, args []string) error {
ep, stop := internal.StartServer(ctx, v23.GetListenSpec(ctx))
- vlog.Infof("Listening on %s", ep.Name())
+ ctx.Infof("Listening on %s", ep.Name())
defer stop()
<-signals.ShutdownOnSignals(ctx)
return nil
diff --git a/runtime/internal/rpc/benchmark/internal/client.go b/runtime/internal/rpc/benchmark/internal/client.go
index 95a76e0..8a712b2 100644
--- a/runtime/internal/rpc/benchmark/internal/client.go
+++ b/runtime/internal/rpc/benchmark/internal/client.go
@@ -12,7 +12,6 @@
"v.io/v23/context"
- "v.io/x/lib/vlog"
"v.io/x/ref/runtime/internal/rpc/benchmark"
tbm "v.io/x/ref/test/benchmark"
)
@@ -38,10 +37,10 @@
b.StopTimer()
if err != nil {
- vlog.Fatalf("Echo failed: %v", err)
+ ctx.Fatalf("Echo failed: %v", err)
}
if !bytes.Equal(r, payload) {
- vlog.Fatalf("Echo returned %v, but expected %v", r, payload)
+ ctx.Fatalf("Echo returned %v, but expected %v", r, payload)
}
stats.Add(elapsed)
@@ -95,7 +94,7 @@
stream, err := stub.EchoStream(ctx)
if err != nil {
- vlog.Fatalf("EchoStream failed: %v", err)
+ ctx.Fatalf("EchoStream failed: %v", err)
}
rDone := make(chan error, 1)
@@ -121,19 +120,19 @@
sStream := stream.SendStream()
for i := 0; i < chunkCnt; i++ {
if err = sStream.Send(payload); err != nil {
- vlog.Fatalf("EchoStream Send failed: %v", err)
+ ctx.Fatalf("EchoStream Send failed: %v", err)
}
}
if err = sStream.Close(); err != nil {
- vlog.Fatalf("EchoStream Close failed: %v", err)
+ ctx.Fatalf("EchoStream Close failed: %v", err)
}
if err = <-rDone; err != nil {
- vlog.Fatalf("%v", err)
+ ctx.Fatalf("%v", err)
}
if err = stream.Finish(); err != nil {
- vlog.Fatalf("Finish failed: %v", err)
+ ctx.Fatalf("Finish failed: %v", err)
}
elapsed := time.Since(start)
diff --git a/runtime/internal/rpc/benchmark/internal/server.go b/runtime/internal/rpc/benchmark/internal/server.go
index ec3c0f5..1c8ec17 100644
--- a/runtime/internal/rpc/benchmark/internal/server.go
+++ b/runtime/internal/rpc/benchmark/internal/server.go
@@ -10,7 +10,6 @@
"v.io/v23/naming"
"v.io/v23/rpc"
- "v.io/x/lib/vlog"
"v.io/x/ref/lib/security/securityflag"
"v.io/x/ref/runtime/internal/rpc/benchmark"
)
@@ -40,22 +39,22 @@
func StartServer(ctx *context.T, listenSpec rpc.ListenSpec) (naming.Endpoint, func()) {
server, err := v23.NewServer(ctx)
if err != nil {
- vlog.Fatalf("NewServer failed: %v", err)
+ ctx.Fatalf("NewServer failed: %v", err)
}
eps, err := server.Listen(listenSpec)
if err != nil {
- vlog.Fatalf("Listen failed: %v", err)
+ ctx.Fatalf("Listen failed: %v", err)
}
if len(eps) == 0 {
- vlog.Fatal("No local address to listen on")
+ ctx.Fatal("No local address to listen on")
}
if err := server.Serve("", benchmark.BenchmarkServer(&impl{}), securityflag.NewAuthorizerOrDie()); err != nil {
- vlog.Fatalf("Serve failed: %v", err)
+ ctx.Fatalf("Serve failed: %v", err)
}
return eps[0], func() {
if err := server.Stop(); err != nil {
- vlog.Fatalf("Stop() failed: %v", err)
+ ctx.Fatalf("Stop() failed: %v", err)
}
}
}
diff --git a/runtime/internal/rpc/benchmark/simple/main.go b/runtime/internal/rpc/benchmark/simple/main.go
index 6806775..c144569 100644
--- a/runtime/internal/rpc/benchmark/simple/main.go
+++ b/runtime/internal/rpc/benchmark/simple/main.go
@@ -15,7 +15,6 @@
"v.io/v23/context"
"v.io/v23/naming"
- "v.io/x/lib/vlog"
_ "v.io/x/ref/runtime/factories/static"
"v.io/x/ref/runtime/internal/rpc/benchmark/internal"
"v.io/x/ref/runtime/internal/rpc/stream/manager"
@@ -48,6 +47,7 @@
defer runtime.GOMAXPROCS(mp)
principal := testutil.NewPrincipal("test")
+ nctx, _ := v23.WithPrincipal(ctx, principal)
b.ResetTimer()
for i := 0; i < b.N; i++ {
@@ -55,9 +55,9 @@
b.StartTimer()
- _, err := client.Dial(serverEP, principal)
+ _, err := client.Dial(serverEP, v23.GetPrincipal(nctx))
if err != nil {
- vlog.Fatalf("Dial failed: %v", err)
+ ctx.Fatalf("Dial failed: %v", err)
}
b.StopTimer()
