diff options
| author |  Mark D. Roth <roth@google.com> | 2016-09-21 08:01:05 -0700 |
|---|---|---|
| committer | Mark D. Roth <roth@google.com> | 2016-09-21 08:01:05 -0700 |
| commit | 3c09810ac95d7aac9eb13e09ae6c59a68fc1217e (patch) | |
| tree | 2de8790d0609c3ea75d3d6c0e6af40bf83be6b26 /src/core/ext/client_config/client_channel.h | |
| parent | 219db50d39c2b5754e86838a56d7c8b0bc7273df (diff) | |
| parent | 5bedd48c0e8b9582841c511037bc20781a6c681c (diff) | |
Merge remote-tracking branch 'upstream/master' into deadline_filter
Diffstat (limited to 'src/core/ext/client_config/client_channel.h')
| -rw-r--r-- | src/core/ext/client_config/client_channel.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/core/ext/client_config/client_channel.h b/src/core/ext/client_config/client_channel.h index 1e47ad34ad..abb5ac4d87 100644 --- a/src/core/ext/client_config/client_channel.h +++ b/src/core/ext/client_config/client_channel.h @@ -34,6 +34,7 @@ #ifndef GRPC_CORE_EXT_CLIENT_CONFIG_CLIENT_CHANNEL_H #define GRPC_CORE_EXT_CLIENT_CONFIG_CLIENT_CHANNEL_H +#include "src/core/ext/client_config/client_channel_factory.h" #include "src/core/ext/client_config/resolver.h" #include "src/core/lib/channel/channel_stack.h" @@ -46,12 +47,12 @@ extern const grpc_channel_filter grpc_client_channel_filter; -/* post-construction initializer to let the client channel know which - transport setup it should cancel upon destruction, or initiate when it needs - a connection */ -void grpc_client_channel_set_resolver(grpc_exec_ctx *exec_ctx, - grpc_channel_stack *channel_stack, - grpc_resolver *resolver); +/* Post-construction initializer to give the client channel its resolver + and factory. */ +void grpc_client_channel_finish_initialization( + grpc_exec_ctx *exec_ctx, grpc_channel_stack *channel_stack, + grpc_resolver *resolver, + grpc_client_channel_factory *client_channel_factory); grpc_connectivity_state grpc_client_channel_check_connectivity_state( grpc_exec_ctx *exec_ctx, grpc_channel_element *elem, int try_to_connect); |