diff options
author | ncteisen <ncteisen@gmail.com> | 2017-01-11 14:47:10 -0800 |
---|---|---|
committer | ncteisen <ncteisen@gmail.com> | 2017-01-11 14:47:10 -0800 |
commit | 1a75c546d071d0a3f63642dc219a450dbd751e15 (patch) | |
tree | 73fdd5ecede4319c3ab78814f96ed40f9cb79ca4 /src/core/lib/surface/channel.h | |
parent | d803b805aef97a03bd5873c1a8c3e534bd22feb7 (diff) | |
parent | 1d8db034928cffc681e52809a343cbb9b3215281 (diff) |
Merge branch 'master' of https://github.com/grpc/grpc into rst_stream_error_code_fix
Diffstat (limited to 'src/core/lib/surface/channel.h')
-rw-r--r-- | src/core/lib/surface/channel.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/core/lib/surface/channel.h b/src/core/lib/surface/channel.h index 23cc8656ca..2ebadb7a15 100644 --- a/src/core/lib/surface/channel.h +++ b/src/core/lib/surface/channel.h @@ -51,9 +51,10 @@ grpc_channel *grpc_channel_create(grpc_exec_ctx *exec_ctx, const char *target, properties from the server call to this new client call, depending on the value of \a propagation_mask (see propagation_bits.h for possible values) */ grpc_call *grpc_channel_create_pollset_set_call( - grpc_channel *channel, grpc_call *parent_call, uint32_t propagation_mask, - grpc_pollset_set *pollset_set, const char *method, const char *host, - gpr_timespec deadline, void *reserved); + grpc_exec_ctx *exec_ctx, grpc_channel *channel, grpc_call *parent_call, + uint32_t propagation_mask, grpc_pollset_set *pollset_set, + const char *method, const char *host, gpr_timespec deadline, + void *reserved); /** Get a (borrowed) pointer to this channels underlying channel stack */ grpc_channel_stack *grpc_channel_get_channel_stack(grpc_channel *channel); @@ -62,7 +63,8 @@ grpc_channel_stack *grpc_channel_get_channel_stack(grpc_channel *channel); status_code. The returned elem is owned by the caller. */ -grpc_mdelem *grpc_channel_get_reffed_status_elem(grpc_channel *channel, +grpc_mdelem *grpc_channel_get_reffed_status_elem(grpc_exec_ctx *exec_ctx, + grpc_channel *channel, int status_code); #ifdef GRPC_STREAM_REFCOUNT_DEBUG |