Change streaming ping pong args and add comment

test/cpp/microbenchmarks/bm_callback_streaming_ping_pong.cc

@@ -1,6 +1,6 @@
 /*
  *
- * Copyright 2016 gRPC authors.
+ * Copyright 2019 gRPC authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,10 +31,11 @@ auto& force_library_initialization = Library::get();
 
 // Replace "benchmark::internal::Benchmark" with "::testing::Benchmark" to use
 // internal microbenchmarking tooling
-static void StreamingPingPongArgs(benchmark::internal::Benchmark* b) {
+static void StreamingPingPongMsgSizeArgs(benchmark::internal::Benchmark* b) {
   int msg_size = 0;
-
+  // base case: 0 byte ping-pong msgs
-  b->Args({0, 0});  // spl case: 0 ping-pong msgs (msg_size doesn't matter here)
+  b->Args({0, 1});
+  b->Args({0, 2});
 
   for (msg_size = 0; msg_size <= 128 * 1024 * 1024;
        msg_size == 0 ? msg_size++ : msg_size *= 8) {
@@ -42,119 +43,151 @@ static void StreamingPingPongArgs(benchmark::internal::Benchmark* b) {
     b->Args({msg_size, 2});
   }
 }
+
+// Replace "benchmark::internal::Benchmark" with "::testing::Benchmark" to use
+// internal microbenchmarking tooling
+static void StreamingPingPongMsgsNumberArgs(benchmark::internal::Benchmark* b) {
+  int msg_number = 0;
+
+  for (msg_number = 0; msg_number <= 128 * 1024;
+       msg_number == 0 ? msg_number++ : msg_number *= 8) {
+    b->Args({0, msg_number});
+    // 64 KiB same as the synthetic test configuration
+    b->Args({64 * 1024, msg_number});
+  }
+}
+
+// Streaming with different message size
 BENCHMARK_TEMPLATE(BM_CallbackBidiStreaming, InProcess, NoOpMutator,
                    NoOpMutator)
-    ->Apply(StreamingPingPongArgs);
+    ->Apply(StreamingPingPongMsgSizeArgs);
 BENCHMARK_TEMPLATE(BM_CallbackBidiStreaming, MinInProcess, NoOpMutator,
                    NoOpMutator)
-    ->Apply(StreamingPingPongArgs);
+    ->Apply(StreamingPingPongMsgSizeArgs);
 BENCHMARK_TEMPLATE(BM_CallbackBidiStreaming, InProcessCHTTP2, NoOpMutator,
                    NoOpMutator)
-    ->Apply(StreamingPingPongArgs);
+    ->Apply(StreamingPingPongMsgSizeArgs);
 BENCHMARK_TEMPLATE(BM_CallbackBidiStreaming, MinInProcessCHTTP2, NoOpMutator,
                    NoOpMutator)
-    ->Apply(StreamingPingPongArgs);
+    ->Apply(StreamingPingPongMsgSizeArgs);
 
+// Streaming with different message number
+BENCHMARK_TEMPLATE(BM_CallbackBidiStreaming, InProcess, NoOpMutator,
+                   NoOpMutator)
+    ->Apply(StreamingPingPongMsgsNumberArgs);
+BENCHMARK_TEMPLATE(BM_CallbackBidiStreaming, MinInProcess, NoOpMutator,
+                   NoOpMutator)
+    ->Apply(StreamingPingPongMsgsNumberArgs);
+BENCHMARK_TEMPLATE(BM_CallbackBidiStreaming, InProcessCHTTP2, NoOpMutator,
+                   NoOpMutator)
+    ->Apply(StreamingPingPongMsgsNumberArgs);
+BENCHMARK_TEMPLATE(BM_CallbackBidiStreaming, MinInProcessCHTTP2, NoOpMutator,
+                   NoOpMutator)
+    ->Apply(StreamingPingPongMsgsNumberArgs);
+
+// Client context with different metadata
 BENCHMARK_TEMPLATE(BM_CallbackBidiStreaming, InProcessCHTTP2,
                    Client_AddMetadata<RandomBinaryMetadata<10>, 1>, NoOpMutator)
-    ->Args({0, 0});
+    ->Args({0, 1});
 BENCHMARK_TEMPLATE(BM_CallbackBidiStreaming, InProcessCHTTP2,
                    Client_AddMetadata<RandomBinaryMetadata<31>, 1>, NoOpMutator)
-    ->Args({0, 0});
+    ->Args({0, 1});
 BENCHMARK_TEMPLATE(BM_CallbackBidiStreaming, InProcessCHTTP2,
                    Client_AddMetadata<RandomBinaryMetadata<100>, 1>,
                    NoOpMutator)
-    ->Args({0, 0});
+    ->Args({0, 1});
 BENCHMARK_TEMPLATE(BM_CallbackBidiStreaming, InProcessCHTTP2,
                    Client_AddMetadata<RandomBinaryMetadata<10>, 2>, NoOpMutator)
-    ->Args({0, 0});
+    ->Args({0, 1});
 BENCHMARK_TEMPLATE(BM_CallbackBidiStreaming, InProcessCHTTP2,
                    Client_AddMetadata<RandomBinaryMetadata<31>, 2>, NoOpMutator)
-    ->Args({0, 0});
+    ->Args({0, 1});
 BENCHMARK_TEMPLATE(BM_CallbackBidiStreaming, InProcessCHTTP2,
                    Client_AddMetadata<RandomBinaryMetadata<100>, 2>,
                    NoOpMutator)
-    ->Args({0, 0});
+    ->Args({0, 1});
-BENCHMARK_TEMPLATE(BM_CallbackBidiStreaming, InProcessCHTTP2, NoOpMutator,
-                   Server_AddInitialMetadata<RandomBinaryMetadata<10>, 1>)
-    ->Args({0, 0});
-BENCHMARK_TEMPLATE(BM_CallbackBidiStreaming, InProcessCHTTP2, NoOpMutator,
-                   Server_AddInitialMetadata<RandomBinaryMetadata<31>, 1>)
-    ->Args({0, 0});
-BENCHMARK_TEMPLATE(BM_CallbackBidiStreaming, InProcessCHTTP2, NoOpMutator,
-                   Server_AddInitialMetadata<RandomBinaryMetadata<100>, 1>)
-    ->Args({0, 0});
 BENCHMARK_TEMPLATE(BM_CallbackBidiStreaming, InProcessCHTTP2,
                    Client_AddMetadata<RandomAsciiMetadata<10>, 1>, NoOpMutator)
-    ->Args({0, 0});
+    ->Args({0, 1});
 BENCHMARK_TEMPLATE(BM_CallbackBidiStreaming, InProcessCHTTP2,
                    Client_AddMetadata<RandomAsciiMetadata<31>, 1>, NoOpMutator)
-    ->Args({0, 0});
+    ->Args({0, 1});
 BENCHMARK_TEMPLATE(BM_CallbackBidiStreaming, InProcessCHTTP2,
                    Client_AddMetadata<RandomAsciiMetadata<100>, 1>, NoOpMutator)
-    ->Args({0, 0});
+    ->Args({0, 1});
-BENCHMARK_TEMPLATE(BM_CallbackBidiStreaming, InProcessCHTTP2, NoOpMutator,
-                   Server_AddInitialMetadata<RandomAsciiMetadata<10>, 1>)
-    ->Args({0, 0});
-BENCHMARK_TEMPLATE(BM_CallbackBidiStreaming, InProcessCHTTP2, NoOpMutator,
-                   Server_AddInitialMetadata<RandomAsciiMetadata<31>, 1>)
-    ->Args({0, 0});
-BENCHMARK_TEMPLATE(BM_CallbackBidiStreaming, InProcessCHTTP2, NoOpMutator,
-                   Server_AddInitialMetadata<RandomAsciiMetadata<100>, 1>)
-    ->Args({0, 0});
-BENCHMARK_TEMPLATE(BM_CallbackBidiStreaming, InProcessCHTTP2, NoOpMutator,
-                   Server_AddInitialMetadata<RandomAsciiMetadata<10>, 100>)
-    ->Args({0, 0});
 BENCHMARK_TEMPLATE(BM_CallbackBidiStreaming, InProcess,
                    Client_AddMetadata<RandomBinaryMetadata<10>, 1>, NoOpMutator)
-    ->Args({0, 0});
+    ->Args({0, 1});
 BENCHMARK_TEMPLATE(BM_CallbackBidiStreaming, InProcess,
                    Client_AddMetadata<RandomBinaryMetadata<31>, 1>, NoOpMutator)
-    ->Args({0, 0});
+    ->Args({0, 1});
 BENCHMARK_TEMPLATE(BM_CallbackBidiStreaming, InProcess,
                    Client_AddMetadata<RandomBinaryMetadata<100>, 1>,
                    NoOpMutator)
-    ->Args({0, 0});
+    ->Args({0, 1});
 BENCHMARK_TEMPLATE(BM_CallbackBidiStreaming, InProcess,
                    Client_AddMetadata<RandomBinaryMetadata<10>, 2>, NoOpMutator)
-    ->Args({0, 0});
+    ->Args({0, 1});
 BENCHMARK_TEMPLATE(BM_CallbackBidiStreaming, InProcess,
                    Client_AddMetadata<RandomBinaryMetadata<31>, 2>, NoOpMutator)
-    ->Args({0, 0});
+    ->Args({0, 1});
 BENCHMARK_TEMPLATE(BM_CallbackBidiStreaming, InProcess,
                    Client_AddMetadata<RandomBinaryMetadata<100>, 2>,
                    NoOpMutator)
-    ->Args({0, 0});
+    ->Args({0, 1});
-BENCHMARK_TEMPLATE(BM_CallbackBidiStreaming, InProcess, NoOpMutator,
-                   Server_AddInitialMetadata<RandomBinaryMetadata<10>, 1>)
-    ->Args({0, 0});
-BENCHMARK_TEMPLATE(BM_CallbackBidiStreaming, InProcess, NoOpMutator,
-                   Server_AddInitialMetadata<RandomBinaryMetadata<31>, 1>)
-    ->Args({0, 0});
-BENCHMARK_TEMPLATE(BM_CallbackBidiStreaming, InProcess, NoOpMutator,
-                   Server_AddInitialMetadata<RandomBinaryMetadata<100>, 1>)
-    ->Args({0, 0});
 BENCHMARK_TEMPLATE(BM_CallbackBidiStreaming, InProcess,
                    Client_AddMetadata<RandomAsciiMetadata<10>, 1>, NoOpMutator)
-    ->Args({0, 0});
+    ->Args({0, 1});
 BENCHMARK_TEMPLATE(BM_CallbackBidiStreaming, InProcess,
                    Client_AddMetadata<RandomAsciiMetadata<31>, 1>, NoOpMutator)
-    ->Args({0, 0});
+    ->Args({0, 1});
 BENCHMARK_TEMPLATE(BM_CallbackBidiStreaming, InProcess,
                    Client_AddMetadata<RandomAsciiMetadata<100>, 1>, NoOpMutator)
-    ->Args({0, 0});
+    ->Args({0, 1});
+
+// Server context with different metadata
+BENCHMARK_TEMPLATE(BM_CallbackBidiStreaming, InProcessCHTTP2, NoOpMutator,
+                   Server_AddInitialMetadata<RandomBinaryMetadata<10>, 1>)
+    ->Args({0, 1});
+BENCHMARK_TEMPLATE(BM_CallbackBidiStreaming, InProcessCHTTP2, NoOpMutator,
+                   Server_AddInitialMetadata<RandomBinaryMetadata<31>, 1>)
+    ->Args({0, 1});
+BENCHMARK_TEMPLATE(BM_CallbackBidiStreaming, InProcessCHTTP2, NoOpMutator,
+                   Server_AddInitialMetadata<RandomBinaryMetadata<100>, 1>)
+    ->Args({0, 1});
+BENCHMARK_TEMPLATE(BM_CallbackBidiStreaming, InProcessCHTTP2, NoOpMutator,
+                   Server_AddInitialMetadata<RandomAsciiMetadata<10>, 1>)
+    ->Args({0, 1});
+BENCHMARK_TEMPLATE(BM_CallbackBidiStreaming, InProcessCHTTP2, NoOpMutator,
+                   Server_AddInitialMetadata<RandomAsciiMetadata<31>, 1>)
+    ->Args({0, 1});
+BENCHMARK_TEMPLATE(BM_CallbackBidiStreaming, InProcessCHTTP2, NoOpMutator,
+                   Server_AddInitialMetadata<RandomAsciiMetadata<100>, 1>)
+    ->Args({0, 1});
+BENCHMARK_TEMPLATE(BM_CallbackBidiStreaming, InProcessCHTTP2, NoOpMutator,
+                   Server_AddInitialMetadata<RandomAsciiMetadata<10>, 100>)
+    ->Args({0, 1});
+BENCHMARK_TEMPLATE(BM_CallbackBidiStreaming, InProcess, NoOpMutator,
+                   Server_AddInitialMetadata<RandomBinaryMetadata<10>, 1>)
+    ->Args({0, 1});
+BENCHMARK_TEMPLATE(BM_CallbackBidiStreaming, InProcess, NoOpMutator,
+                   Server_AddInitialMetadata<RandomBinaryMetadata<31>, 1>)
+    ->Args({0, 1});
+BENCHMARK_TEMPLATE(BM_CallbackBidiStreaming, InProcess, NoOpMutator,
+                   Server_AddInitialMetadata<RandomBinaryMetadata<100>, 1>)
+    ->Args({0, 1});
 BENCHMARK_TEMPLATE(BM_CallbackBidiStreaming, InProcess, NoOpMutator,
                    Server_AddInitialMetadata<RandomAsciiMetadata<10>, 1>)
-    ->Args({0, 0});
+    ->Args({0, 1});
 BENCHMARK_TEMPLATE(BM_CallbackBidiStreaming, InProcess, NoOpMutator,
                    Server_AddInitialMetadata<RandomAsciiMetadata<31>, 1>)
-    ->Args({0, 0});
+    ->Args({0, 1});
 BENCHMARK_TEMPLATE(BM_CallbackBidiStreaming, InProcess, NoOpMutator,
                    Server_AddInitialMetadata<RandomAsciiMetadata<100>, 1>)
-    ->Args({0, 0});
+    ->Args({0, 1});
 BENCHMARK_TEMPLATE(BM_CallbackBidiStreaming, InProcess, NoOpMutator,
                    Server_AddInitialMetadata<RandomAsciiMetadata<10>, 100>)
-    ->Args({0, 0});
+    ->Args({0, 1});
 
 }  // namespace testing
 }  // namespace grpc

test/cpp/microbenchmarks/callback_streaming_ping_pong.h

@@ -37,26 +37,26 @@ namespace testing {
 template <class Fixture, class ClientContextMutator, class ServerContextMutator>
 static void BM_CallbackBidiStreaming(benchmark::State& state) {
   const int message_size = state.range(0);
-  const int max_ping_pongs = state.range(1) > 0 ? 1 : state.range(1);
+  const int max_ping_pongs = state.range(1);
   CallbackStreamingTestService service;
   std::unique_ptr<Fixture> fixture(new Fixture(&service));
   std::unique_ptr<EchoTestService::Stub> stub_(
       EchoTestService::NewStub(fixture->channel()));
-  EchoRequest* request = new EchoRequest;
+  EchoRequest request;
-  EchoResponse* response = new EchoResponse;
+  EchoResponse response;
   if (state.range(0) > 0) {
-    request->set_message(std::string(state.range(0), 'a'));
+    request.set_message(std::string(state.range(0), 'a'));
   } else {
-    request->set_message("");
+    request.set_message("");
   }
   while (state.KeepRunning()) {
     GPR_TIMER_SCOPE("BenchmarkCycle", 0);
-    ClientContext* cli_ctx = new ClientContext;
+    ClientContext cli_ctx;
-    cli_ctx->AddMetadata(kServerFinishAfterNReads,
+    cli_ctx.AddMetadata(kServerFinishAfterNReads,
                          grpc::to_string(max_ping_pongs));
-    cli_ctx->AddMetadata(kServerResponseStreamsToSend,
+    cli_ctx.AddMetadata(kServerResponseStreamsToSend,
                          grpc::to_string(message_size));
-    BidiClient test{stub_.get(), request, response, cli_ctx, max_ping_pongs};
+    BidiClient test{stub_.get(), &request, &response, &cli_ctx, max_ping_pongs};
     test.Await();
   }
   fixture->Finish(state);