diff options
| author |  Mark D. Roth <roth@google.com> | 2016-09-16 13:24:05 -0700 |
|---|---|---|
| committer | Mark D. Roth <roth@google.com> | 2016-09-16 13:24:05 -0700 |
| commit | 85102a9eb64ff71814dbace9a179146f8656e21b (patch) | |
| tree | 847d7f20ed84d8da9943486db208febfb75b11a2 /src/core/lib/surface/channel_ping.c | |
| parent | 5c28096ce3b6e5fe0564d836ba69347f5f97dc02 (diff) | |
| parent | ee43d7bbb11a36c91c6f1ebff6bf3da70b7546b2 (diff) | |
Merge remote-tracking branch 'upstream/master' into http_connect
Diffstat (limited to 'src/core/lib/surface/channel_ping.c')
| -rw-r--r-- | src/core/lib/surface/channel_ping.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/core/lib/surface/channel_ping.c b/src/core/lib/surface/channel_ping.c index 9818f9d2f2..0d2f01a649 100644 --- a/src/core/lib/surface/channel_ping.c +++ b/src/core/lib/surface/channel_ping.c @@ -61,19 +61,20 @@ static void ping_done(grpc_exec_ctx *exec_ctx, void *arg, grpc_error *error) { void grpc_channel_ping(grpc_channel *channel, grpc_completion_queue *cq, void *tag, void *reserved) { - grpc_transport_op op; + GRPC_API_TRACE("grpc_channel_ping(channel=%p, cq=%p, tag=%p, reserved=%p)", 4, + (channel, cq, tag, reserved)); + grpc_transport_op *op = grpc_make_transport_op(NULL); ping_result *pr = gpr_malloc(sizeof(*pr)); grpc_channel_element *top_elem = grpc_channel_stack_element(grpc_channel_get_channel_stack(channel), 0); grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; GPR_ASSERT(reserved == NULL); - memset(&op, 0, sizeof(op)); pr->tag = tag; pr->cq = cq; grpc_closure_init(&pr->closure, ping_done, pr); - op.send_ping = &pr->closure; - op.bind_pollset = grpc_cq_pollset(cq); + op->send_ping = &pr->closure; + op->bind_pollset = grpc_cq_pollset(cq); grpc_cq_begin_op(cq, tag); - top_elem->filter->start_transport_op(&exec_ctx, top_elem, &op); + top_elem->filter->start_transport_op(&exec_ctx, top_elem, op); grpc_exec_ctx_finish(&exec_ctx); } |