diff options
| author |  Muxi Yan <mxyan@google.com> | 2017-12-08 10:39:22 -0800 |
|---|---|---|
| committer | Muxi Yan <mxyan@google.com> | 2017-12-08 10:39:22 -0800 |
| commit | 5c5bafff5a7974b54cb16cbf2222580bc0349e77 (patch) | |
| tree | 971fbf16692e3f571ed9d10945ca90d0025b3574 /src/core/lib/surface | |
| parent | fe1e05e75b0bc97c5627fd5848edd6a699544ec2 (diff) | |
| parent | a25697095b39ce4014457a64c2917c5abadbe998 (diff) | |
Merge commit '94e676e^2' into fix-stream-compression-config-interface
Diffstat (limited to 'src/core/lib/surface')
| -rw-r--r-- | src/core/lib/surface/channel_ping.cc | 2 | ||||
| -rw-r--r-- | src/core/lib/surface/lame_client.cc | 9 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/core/lib/surface/channel_ping.cc b/src/core/lib/surface/channel_ping.cc index e8f47f01cf..7b1964fd55 100644 --- a/src/core/lib/surface/channel_ping.cc +++ b/src/core/lib/surface/channel_ping.cc @@ -57,7 +57,7 @@ void grpc_channel_ping(grpc_channel* channel, grpc_completion_queue* cq, pr->tag = tag; pr->cq = cq; GRPC_CLOSURE_INIT(&pr->closure, ping_done, pr, grpc_schedule_on_exec_ctx); - op->send_ping = &pr->closure; + op->send_ping.on_ack = &pr->closure; op->bind_pollset = grpc_cq_pollset(cq); GPR_ASSERT(grpc_cq_begin_op(cq, tag)); top_elem->filter->start_transport_op(&exec_ctx, top_elem, op); diff --git a/src/core/lib/surface/lame_client.cc b/src/core/lib/surface/lame_client.cc index c32c9af50e..559d7af43e 100644 --- a/src/core/lib/surface/lame_client.cc +++ b/src/core/lib/surface/lame_client.cc @@ -104,9 +104,14 @@ static void lame_start_transport_op(grpc_exec_ctx* exec_ctx, GRPC_CLOSURE_SCHED(exec_ctx, op->on_connectivity_state_change, GRPC_ERROR_NONE); } - if (op->send_ping != nullptr) { + if (op->send_ping.on_initiate != nullptr) { GRPC_CLOSURE_SCHED( - exec_ctx, op->send_ping, + exec_ctx, op->send_ping.on_initiate, + GRPC_ERROR_CREATE_FROM_STATIC_STRING("lame client channel")); + } + if (op->send_ping.on_ack != nullptr) { + GRPC_CLOSURE_SCHED( + exec_ctx, op->send_ping.on_ack, GRPC_ERROR_CREATE_FROM_STATIC_STRING("lame client channel")); } GRPC_ERROR_UNREF(op->disconnect_with_error); |