diff options
| author |  Noah Eisen <ncteisen@google.com> | 2017-03-22 14:34:42 -0700 |
|---|---|---|
| committer | Noah Eisen <ncteisen@google.com> | 2017-03-22 14:40:28 -0700 |
| commit | 3d194ad7a3efbb2ba159f021b9692f8b2dec9f88 (patch) | |
| tree | 6aac622a69f89f700206ebe683b05d804f93b7e7 /src/core/lib/channel/connected_channel.c | |
| parent | 1a3f24dc1eafe065e4761060724444a1a970f745 (diff) | |
| parent | 3f90a955a95b22ef39fece2de82fbef828c0e159 (diff) | |
Merge branch 'master' of https://github.com/grpc/grpc into error-slice-optimization
Diffstat (limited to 'src/core/lib/channel/connected_channel.c')
| -rw-r--r-- | src/core/lib/channel/connected_channel.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/lib/channel/connected_channel.c b/src/core/lib/channel/connected_channel.c index e7859baf18..75c68a5534 100644 --- a/src/core/lib/channel/connected_channel.c +++ b/src/core/lib/channel/connected_channel.c @@ -88,7 +88,7 @@ static grpc_error *init_call_elem(grpc_exec_ctx *exec_ctx, channel_data *chand = elem->channel_data; int r = grpc_transport_init_stream( exec_ctx, chand->transport, TRANSPORT_STREAM_FROM_CALL_DATA(calld), - &args->call_stack->refcount, args->server_transport_data); + &args->call_stack->refcount, args->server_transport_data, args->arena); return r == 0 ? GRPC_ERROR_NONE : GRPC_ERROR_CREATE_FROM_STATIC_STRING( "transport stream initialization failed"); @@ -106,12 +106,12 @@ static void set_pollset_or_pollset_set(grpc_exec_ctx *exec_ctx, /* Destructor for call_data */ static void destroy_call_elem(grpc_exec_ctx *exec_ctx, grpc_call_element *elem, const grpc_call_final_info *final_info, - void *and_free_memory) { + grpc_closure *then_schedule_closure) { call_data *calld = elem->call_data; channel_data *chand = elem->channel_data; grpc_transport_destroy_stream(exec_ctx, chand->transport, TRANSPORT_STREAM_FROM_CALL_DATA(calld), - and_free_memory); + then_schedule_closure); } /* Constructor for channel_data */ |