use new proto option in C#

jevey · Nov 19, 2015 · 18ce9d6 · 18ce9d6
1 parent 4d7dbbf
commit 18ce9d6
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 7 deletions.
diff --git a/src/csharp/Grpc.IntegrationTesting/ClientRunners.cs b/src/csharp/Grpc.IntegrationTesting/ClientRunners.cs
@@ -66,7 +66,9 @@ public static IClientRunner CreateStarted(ClientConfig config)
             switch (config.RpcType)
             {
                 case RpcType.UNARY:
-                    return new SyncUnaryClientRunner(channel, config.PayloadConfig.SimpleParams.ReqSize);
+                    return new SyncUnaryClientRunner(channel,
+                        config.PayloadConfig.SimpleParams.ReqSize,
+                        config.HistogramParams);
 
                 case RpcType.STREAMING:
                 default:
@@ -80,6 +82,8 @@ public static IClientRunner CreateStarted(ClientConfig config)
     /// </summary>
     public class SyncUnaryClientRunner : IClientRunner
     {
+        const double SecondsToNanos = 1e9;
+
         readonly Channel channel;
         readonly int payloadSize;
         readonly Histogram histogram;
@@ -89,11 +93,11 @@ public class SyncUnaryClientRunner : IClientRunner
         readonly CancellationTokenSource stoppedCts;
         readonly WallClockStopwatch wallClockStopwatch = new WallClockStopwatch();
 
-        public SyncUnaryClientRunner(Channel channel, int payloadSize)
+        public SyncUnaryClientRunner(Channel channel, int payloadSize, HistogramParams histogramParams)
         {
             this.channel = Grpc.Core.Utils.Preconditions.CheckNotNull(channel);
             this.payloadSize = payloadSize;
-            this.histogram = new Histogram(0.01, 60e9);  // TODO: needs to be in sync with test/cpp/qps/histogram.h
+            this.histogram = new Histogram(histogramParams.Resolution, histogramParams.MaxPossible);
 
             this.stoppedCts = new CancellationTokenSource();
             this.client = BenchmarkService.NewClient(channel);
@@ -136,8 +140,8 @@ private void Run()
                 client.UnaryCall(request);
                 stopwatch.Stop();
 
-                // TODO: 1e9 needs to be in sync with C++ code
-                histogram.AddObservation(stopwatch.Elapsed.TotalSeconds * 1e9);
+                // spec requires data point in nanoseconds.
+                histogram.AddObservation(stopwatch.Elapsed.TotalSeconds * SecondsToNanos);
             }
         }
 

diff --git a/src/csharp/Grpc.IntegrationTesting/RunnerClientServerTest.cs b/src/csharp/Grpc.IntegrationTesting/RunnerClientServerTest.cs
@@ -57,6 +57,7 @@ public void Init()
             var serverConfig = new ServerConfig
             {
                 ServerType = ServerType.ASYNC_SERVER,
+                Host = Host,
                 PayloadConfig = new PayloadConfig
                 {
                     SimpleParams = new SimpleProtoParams
@@ -90,6 +91,11 @@ public async Task ClientServerRunner()
                     {
                         ReqSize = 100
                     }
+                },
+                HistogramParams = new HistogramParams
+                {
+                    Resolution = 0.01,
+                    MaxPossible = 60e9
                 }
             };
 
@@ -105,7 +111,7 @@ public async Task ClientServerRunner()
             await runner.StopAsync();
 
             System.Console.WriteLine(stats);
-            System.Console.WriteLine("avg micros/call " + (long) ((stats.Latencies.Sum / stats.Latencies.Count) * 1000000));
+            System.Console.WriteLine("avg micros/call " + (long) (stats.Latencies.Sum / stats.Latencies.Count / 1000.0));
         }
     }
 }
diff --git a/src/csharp/Grpc.IntegrationTesting/ServerRunners.cs b/src/csharp/Grpc.IntegrationTesting/ServerRunners.cs
@@ -65,7 +65,7 @@ public static IServerRunner CreateStarted(ServerConfig config)
             var server = new Server
             {
                 Services = { BenchmarkService.BindService(new BenchmarkServiceImpl(responseSize)) },
-                Ports = { new ServerPort("0.0.0.0", config.Port, credentials) }
+                Ports = { new ServerPort(config.Host, config.Port, credentials) }
             };
 
             server.Start();

diff --git a/test/proto/benchmarks/stats.proto b/test/proto/benchmarks/stats.proto
@@ -60,6 +60,7 @@ message HistogramData {
 }
 
 message ClientStats {
+  // Latency histogram. Data points are in nanoseconds.
   HistogramData latencies = 1;
 
   // See ServerStats for details.