commit 2d7269746d160ff62aae8a82eef4abd85862f9df
author Asim Shankar <ashankar@google.com> Mon Jun 01 17:29:28 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jun 01 17:29:28 2015 +0000
tree 2457477a37db779a42e12432d3433e1b0f50cd58
parent 8b5320599f95cee7fc49e56ab42a25261defc99a
parent 187b5a27f54629e4bba0431fb8f0a5320481df5d

Merge "runtime/internal/rpc/stream/benchmark: Fix VIF benchmarks."

runtime/internal/rpc/stream/benchmark/dial_vif.go

diff --git a/runtime/internal/rpc/stream/benchmark/dial_vif.go b/runtime/internal/rpc/stream/benchmark/dial_vif.go
index 2278839..52ed62f 100644
--- a/runtime/internal/rpc/stream/benchmark/dial_vif.go
+++ b/runtime/internal/rpc/stream/benchmark/dial_vif.go
@@ -36,10 +36,11 @@
 		b.StopTimer()
 		nc, ns := net.Pipe()
 
-		server, err := vif.InternalNewAcceptedVIF(ns, naming.FixedRoutingID(0x5), principal, blessings, nil, nil)
-		if err != nil {
-			b.Fatal(err)
-		}
+		serverch := make(chan *vif.VIF)
+		go func() {
+			server, _ := vif.InternalNewAcceptedVIF(ns, naming.FixedRoutingID(0x5), principal, blessings, nil, nil)
+			serverch <- server
+		}()
 
 		b.StartTimer()
 		start := time.Now()
@@ -55,6 +56,8 @@
 		stats.Add(duration)
 
 		client.Close()
-		server.Close()
+		if server := <-serverch; server != nil {
+			server.Close()
+		}
 	}
 }