diff options
| author |  Yash Tibrewal <yashkt@google.com> | 2017-12-05 17:49:11 -0800 |
|---|---|---|
| committer | Yash Tibrewal <yashkt@google.com> | 2017-12-05 17:49:11 -0800 |
| commit | 73bb67d054ecb952f10649cc42c998ab7ea8facd (patch) | |
| tree | 181ee31adc7a144d8dcffed5e5de990ab4662cef /test/cpp/microbenchmarks | |
| parent | 65c45fbb4d576d99bcd1c00a13f430c8994fee38 (diff) | |
| parent | 05cd3102b7b59bf5d71f66dc012be1f4ecdaad88 (diff) | |
Merge master into execctx
Diffstat (limited to 'test/cpp/microbenchmarks')
| -rw-r--r-- | test/cpp/microbenchmarks/bm_chttp2_transport.cc | 2 | ||||
| -rw-r--r-- | test/cpp/microbenchmarks/fullstack_fixtures.h | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/test/cpp/microbenchmarks/bm_chttp2_transport.cc b/test/cpp/microbenchmarks/bm_chttp2_transport.cc index 43bbbad880..fcb1677d09 100644 --- a/test/cpp/microbenchmarks/bm_chttp2_transport.cc +++ b/test/cpp/microbenchmarks/bm_chttp2_transport.cc @@ -132,7 +132,7 @@ class Fixture { grpc_channel_args c_args = args.c_channel_args(); ep_ = new DummyEndpoint; t_ = grpc_create_chttp2_transport(&c_args, ep_, client); - grpc_chttp2_transport_start_reading(t_, nullptr); + grpc_chttp2_transport_start_reading(t_, nullptr, nullptr); FlushExecCtx(); } diff --git a/test/cpp/microbenchmarks/fullstack_fixtures.h b/test/cpp/microbenchmarks/fullstack_fixtures.h index ab0a696e3d..d1ede755a5 100644 --- a/test/cpp/microbenchmarks/fullstack_fixtures.h +++ b/test/cpp/microbenchmarks/fullstack_fixtures.h @@ -174,7 +174,7 @@ class EndpointPairFixture : public BaseFixture { const grpc_channel_args* server_args = grpc_server_get_channel_args(server_->c_server()); server_transport_ = grpc_create_chttp2_transport( - server_args, endpoints.server, 0 /* is_client */); + server_args, endpoints.server, false /* is_client */); grpc_pollset** pollsets; size_t num_pollsets = 0; @@ -186,7 +186,7 @@ class EndpointPairFixture : public BaseFixture { grpc_server_setup_transport(server_->c_server(), server_transport_, nullptr, server_args); - grpc_chttp2_transport_start_reading(server_transport_, nullptr); + grpc_chttp2_transport_start_reading(server_transport_, nullptr, nullptr); } /* create channel */ @@ -197,11 +197,11 @@ class EndpointPairFixture : public BaseFixture { grpc_channel_args c_args = args.c_channel_args(); client_transport_ = - grpc_create_chttp2_transport(&c_args, endpoints.client, 1); + grpc_create_chttp2_transport(&c_args, endpoints.client, true); GPR_ASSERT(client_transport_); grpc_channel* channel = grpc_channel_create( "target", &c_args, GRPC_CLIENT_DIRECT_CHANNEL, client_transport_); - grpc_chttp2_transport_start_reading(client_transport_, nullptr); + grpc_chttp2_transport_start_reading(client_transport_, nullptr, nullptr); channel_ = CreateChannelInternal("", channel); } |