Merge branch 'subchannel_factory_create_lb_channel' of github.com:dgquintas/grpc into ccmerge

pull/6043/head
Craig Tiller 9 years ago
commit 74071cdab0
  1. 12
      BUILD
  2. 4
      Makefile
  3. 2
      binding.gyp
  4. 4
      build.yaml
  5. 2
      config.m4
  6. 6
      gRPC.podspec
  7. 4
      grpc.gemspec
  8. 4
      package.json
  9. 4
      package.xml
  10. 2
      src/core/ext/client_config/README.md
  11. 57
      src/core/ext/client_config/client_channel_factory.c
  12. 86
      src/core/ext/client_config/client_channel_factory.h
  13. 4
      src/core/ext/client_config/lb_policy_factory.h
  14. 4
      src/core/ext/client_config/resolver_factory.h
  15. 4
      src/core/ext/client_config/resolver_registry.c
  16. 2
      src/core/ext/client_config/resolver_registry.h
  17. 6
      src/core/ext/lb_policy/pick_first/pick_first.c
  18. 6
      src/core/ext/lb_policy/round_robin/round_robin.c
  19. 10
      src/core/ext/resolver/dns/native/dns_resolver.c
  20. 10
      src/core/ext/resolver/sockaddr/sockaddr_resolver.c
  21. 11
      src/core/ext/resolver/zookeeper/zookeeper_resolver.c
  22. 89
      src/core/ext/transport/chttp2/client/insecure/channel_create.c
  23. 101
      src/core/ext/transport/chttp2/client/secure/secure_channel_create.c
  24. 1
      src/core/lib/surface/channel.h
  25. 2
      src/python/grpcio/grpc_core_dependencies.py
  26. 28
      test/core/client_config/resolvers/dns_resolver_connectivity_test.c
  27. 28
      test/core/client_config/resolvers/dns_resolver_test.c
  28. 28
      test/core/client_config/resolvers/sockaddr_resolver_test.c
  29. 4
      tools/doxygen/Doxyfile.core.internal
  30. 12
      tools/run_tests/sources_and_headers.json
  31. 6
      vsprojects/vcxproj/grpc/grpc.vcxproj
  32. 12
      vsprojects/vcxproj/grpc/grpc.vcxproj.filters
  33. 6
      vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj
  34. 12
      vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters

12
BUILD

@ -166,6 +166,7 @@ cc_library(
"src/core/ext/census/mlog.h", "src/core/ext/census/mlog.h",
"src/core/ext/census/rpc_metric_id.h", "src/core/ext/census/rpc_metric_id.h",
"src/core/ext/client_config/client_channel.h", "src/core/ext/client_config/client_channel.h",
"src/core/ext/client_config/client_channel_factory.h",
"src/core/ext/client_config/client_config.h", "src/core/ext/client_config/client_config.h",
"src/core/ext/client_config/connector.h", "src/core/ext/client_config/connector.h",
"src/core/ext/client_config/initial_connect_string.h", "src/core/ext/client_config/initial_connect_string.h",
@ -176,7 +177,6 @@ cc_library(
"src/core/ext/client_config/resolver_factory.h", "src/core/ext/client_config/resolver_factory.h",
"src/core/ext/client_config/resolver_registry.h", "src/core/ext/client_config/resolver_registry.h",
"src/core/ext/client_config/subchannel.h", "src/core/ext/client_config/subchannel.h",
"src/core/ext/client_config/subchannel_factory.h",
"src/core/ext/client_config/subchannel_index.h", "src/core/ext/client_config/subchannel_index.h",
"src/core/ext/client_config/uri_parser.h", "src/core/ext/client_config/uri_parser.h",
"src/core/ext/lb_policy/grpclb/load_balancer_api.h", "src/core/ext/lb_policy/grpclb/load_balancer_api.h",
@ -301,6 +301,7 @@ cc_library(
"src/core/ext/census/tracing.c", "src/core/ext/census/tracing.c",
"src/core/ext/client_config/channel_connectivity.c", "src/core/ext/client_config/channel_connectivity.c",
"src/core/ext/client_config/client_channel.c", "src/core/ext/client_config/client_channel.c",
"src/core/ext/client_config/client_channel_factory.c",
"src/core/ext/client_config/client_config.c", "src/core/ext/client_config/client_config.c",
"src/core/ext/client_config/connector.c", "src/core/ext/client_config/connector.c",
"src/core/ext/client_config/default_initial_connect_string.c", "src/core/ext/client_config/default_initial_connect_string.c",
@ -312,7 +313,6 @@ cc_library(
"src/core/ext/client_config/resolver_factory.c", "src/core/ext/client_config/resolver_factory.c",
"src/core/ext/client_config/resolver_registry.c", "src/core/ext/client_config/resolver_registry.c",
"src/core/ext/client_config/subchannel.c", "src/core/ext/client_config/subchannel.c",
"src/core/ext/client_config/subchannel_factory.c",
"src/core/ext/client_config/subchannel_index.c", "src/core/ext/client_config/subchannel_index.c",
"src/core/ext/client_config/uri_parser.c", "src/core/ext/client_config/uri_parser.c",
"src/core/ext/lb_policy/grpclb/load_balancer_api.c", "src/core/ext/lb_policy/grpclb/load_balancer_api.c",
@ -529,6 +529,7 @@ cc_library(
"src/core/ext/census/mlog.h", "src/core/ext/census/mlog.h",
"src/core/ext/census/rpc_metric_id.h", "src/core/ext/census/rpc_metric_id.h",
"src/core/ext/client_config/client_channel.h", "src/core/ext/client_config/client_channel.h",
"src/core/ext/client_config/client_channel_factory.h",
"src/core/ext/client_config/client_config.h", "src/core/ext/client_config/client_config.h",
"src/core/ext/client_config/connector.h", "src/core/ext/client_config/connector.h",
"src/core/ext/client_config/initial_connect_string.h", "src/core/ext/client_config/initial_connect_string.h",
@ -539,7 +540,6 @@ cc_library(
"src/core/ext/client_config/resolver_factory.h", "src/core/ext/client_config/resolver_factory.h",
"src/core/ext/client_config/resolver_registry.h", "src/core/ext/client_config/resolver_registry.h",
"src/core/ext/client_config/subchannel.h", "src/core/ext/client_config/subchannel.h",
"src/core/ext/client_config/subchannel_factory.h",
"src/core/ext/client_config/subchannel_index.h", "src/core/ext/client_config/subchannel_index.h",
"src/core/ext/client_config/uri_parser.h", "src/core/ext/client_config/uri_parser.h",
"src/core/ext/lb_policy/grpclb/load_balancer_api.h", "src/core/ext/lb_policy/grpclb/load_balancer_api.h",
@ -650,6 +650,7 @@ cc_library(
"src/core/ext/census/tracing.c", "src/core/ext/census/tracing.c",
"src/core/ext/client_config/channel_connectivity.c", "src/core/ext/client_config/channel_connectivity.c",
"src/core/ext/client_config/client_channel.c", "src/core/ext/client_config/client_channel.c",
"src/core/ext/client_config/client_channel_factory.c",
"src/core/ext/client_config/client_config.c", "src/core/ext/client_config/client_config.c",
"src/core/ext/client_config/connector.c", "src/core/ext/client_config/connector.c",
"src/core/ext/client_config/default_initial_connect_string.c", "src/core/ext/client_config/default_initial_connect_string.c",
@ -661,7 +662,6 @@ cc_library(
"src/core/ext/client_config/resolver_factory.c", "src/core/ext/client_config/resolver_factory.c",
"src/core/ext/client_config/resolver_registry.c", "src/core/ext/client_config/resolver_registry.c",
"src/core/ext/client_config/subchannel.c", "src/core/ext/client_config/subchannel.c",
"src/core/ext/client_config/subchannel_factory.c",
"src/core/ext/client_config/subchannel_index.c", "src/core/ext/client_config/subchannel_index.c",
"src/core/ext/client_config/uri_parser.c", "src/core/ext/client_config/uri_parser.c",
"src/core/ext/lb_policy/grpclb/load_balancer_api.c", "src/core/ext/lb_policy/grpclb/load_balancer_api.c",
@ -1355,6 +1355,7 @@ objc_library(
"src/core/ext/census/tracing.c", "src/core/ext/census/tracing.c",
"src/core/ext/client_config/channel_connectivity.c", "src/core/ext/client_config/channel_connectivity.c",
"src/core/ext/client_config/client_channel.c", "src/core/ext/client_config/client_channel.c",
"src/core/ext/client_config/client_channel_factory.c",
"src/core/ext/client_config/client_config.c", "src/core/ext/client_config/client_config.c",
"src/core/ext/client_config/connector.c", "src/core/ext/client_config/connector.c",
"src/core/ext/client_config/default_initial_connect_string.c", "src/core/ext/client_config/default_initial_connect_string.c",
@ -1366,7 +1367,6 @@ objc_library(
"src/core/ext/client_config/resolver_factory.c", "src/core/ext/client_config/resolver_factory.c",
"src/core/ext/client_config/resolver_registry.c", "src/core/ext/client_config/resolver_registry.c",
"src/core/ext/client_config/subchannel.c", "src/core/ext/client_config/subchannel.c",
"src/core/ext/client_config/subchannel_factory.c",
"src/core/ext/client_config/subchannel_index.c", "src/core/ext/client_config/subchannel_index.c",
"src/core/ext/client_config/uri_parser.c", "src/core/ext/client_config/uri_parser.c",
"src/core/ext/lb_policy/grpclb/load_balancer_api.c", "src/core/ext/lb_policy/grpclb/load_balancer_api.c",
@ -1525,6 +1525,7 @@ objc_library(
"src/core/ext/census/mlog.h", "src/core/ext/census/mlog.h",
"src/core/ext/census/rpc_metric_id.h", "src/core/ext/census/rpc_metric_id.h",
"src/core/ext/client_config/client_channel.h", "src/core/ext/client_config/client_channel.h",
"src/core/ext/client_config/client_channel_factory.h",
"src/core/ext/client_config/client_config.h", "src/core/ext/client_config/client_config.h",
"src/core/ext/client_config/connector.h", "src/core/ext/client_config/connector.h",
"src/core/ext/client_config/initial_connect_string.h", "src/core/ext/client_config/initial_connect_string.h",
@ -1535,7 +1536,6 @@ objc_library(
"src/core/ext/client_config/resolver_factory.h", "src/core/ext/client_config/resolver_factory.h",
"src/core/ext/client_config/resolver_registry.h", "src/core/ext/client_config/resolver_registry.h",
"src/core/ext/client_config/subchannel.h", "src/core/ext/client_config/subchannel.h",
"src/core/ext/client_config/subchannel_factory.h",
"src/core/ext/client_config/subchannel_index.h", "src/core/ext/client_config/subchannel_index.h",
"src/core/ext/client_config/uri_parser.h", "src/core/ext/client_config/uri_parser.h",
"src/core/ext/lb_policy/grpclb/load_balancer_api.h", "src/core/ext/lb_policy/grpclb/load_balancer_api.h",

@ -2449,6 +2449,7 @@ LIBGRPC_SRC = \
src/core/ext/census/tracing.c \ src/core/ext/census/tracing.c \
src/core/ext/client_config/channel_connectivity.c \ src/core/ext/client_config/channel_connectivity.c \
src/core/ext/client_config/client_channel.c \ src/core/ext/client_config/client_channel.c \
src/core/ext/client_config/client_channel_factory.c \
src/core/ext/client_config/client_config.c \ src/core/ext/client_config/client_config.c \
src/core/ext/client_config/connector.c \ src/core/ext/client_config/connector.c \
src/core/ext/client_config/default_initial_connect_string.c \ src/core/ext/client_config/default_initial_connect_string.c \
@ -2460,7 +2461,6 @@ LIBGRPC_SRC = \
src/core/ext/client_config/resolver_factory.c \ src/core/ext/client_config/resolver_factory.c \
src/core/ext/client_config/resolver_registry.c \ src/core/ext/client_config/resolver_registry.c \
src/core/ext/client_config/subchannel.c \ src/core/ext/client_config/subchannel.c \
src/core/ext/client_config/subchannel_factory.c \
src/core/ext/client_config/subchannel_index.c \ src/core/ext/client_config/subchannel_index.c \
src/core/ext/client_config/uri_parser.c \ src/core/ext/client_config/uri_parser.c \
src/core/ext/lb_policy/grpclb/load_balancer_api.c \ src/core/ext/lb_policy/grpclb/load_balancer_api.c \
@ -2808,6 +2808,7 @@ LIBGRPC_UNSECURE_SRC = \
src/core/ext/census/tracing.c \ src/core/ext/census/tracing.c \
src/core/ext/client_config/channel_connectivity.c \ src/core/ext/client_config/channel_connectivity.c \
src/core/ext/client_config/client_channel.c \ src/core/ext/client_config/client_channel.c \
src/core/ext/client_config/client_channel_factory.c \
src/core/ext/client_config/client_config.c \ src/core/ext/client_config/client_config.c \
src/core/ext/client_config/connector.c \ src/core/ext/client_config/connector.c \
src/core/ext/client_config/default_initial_connect_string.c \ src/core/ext/client_config/default_initial_connect_string.c \
@ -2819,7 +2820,6 @@ LIBGRPC_UNSECURE_SRC = \
src/core/ext/client_config/resolver_factory.c \ src/core/ext/client_config/resolver_factory.c \
src/core/ext/client_config/resolver_registry.c \ src/core/ext/client_config/resolver_registry.c \
src/core/ext/client_config/subchannel.c \ src/core/ext/client_config/subchannel.c \
src/core/ext/client_config/subchannel_factory.c \
src/core/ext/client_config/subchannel_index.c \ src/core/ext/client_config/subchannel_index.c \
src/core/ext/client_config/uri_parser.c \ src/core/ext/client_config/uri_parser.c \
src/core/ext/lb_policy/grpclb/load_balancer_api.c \ src/core/ext/lb_policy/grpclb/load_balancer_api.c \

@ -569,6 +569,7 @@
'src/core/ext/census/tracing.c', 'src/core/ext/census/tracing.c',
'src/core/ext/client_config/channel_connectivity.c', 'src/core/ext/client_config/channel_connectivity.c',
'src/core/ext/client_config/client_channel.c', 'src/core/ext/client_config/client_channel.c',
'src/core/ext/client_config/client_channel_factory.c',
'src/core/ext/client_config/client_config.c', 'src/core/ext/client_config/client_config.c',
'src/core/ext/client_config/connector.c', 'src/core/ext/client_config/connector.c',
'src/core/ext/client_config/default_initial_connect_string.c', 'src/core/ext/client_config/default_initial_connect_string.c',
@ -580,7 +581,6 @@
'src/core/ext/client_config/resolver_factory.c', 'src/core/ext/client_config/resolver_factory.c',
'src/core/ext/client_config/resolver_registry.c', 'src/core/ext/client_config/resolver_registry.c',
'src/core/ext/client_config/subchannel.c', 'src/core/ext/client_config/subchannel.c',
'src/core/ext/client_config/subchannel_factory.c',
'src/core/ext/client_config/subchannel_index.c', 'src/core/ext/client_config/subchannel_index.c',
'src/core/ext/client_config/uri_parser.c', 'src/core/ext/client_config/uri_parser.c',
'src/core/ext/lb_policy/grpclb/load_balancer_api.c', 'src/core/ext/lb_policy/grpclb/load_balancer_api.c',

@ -415,6 +415,7 @@ filegroups:
- name: grpc_client_config - name: grpc_client_config
headers: headers:
- src/core/ext/client_config/client_channel.h - src/core/ext/client_config/client_channel.h
- src/core/ext/client_config/client_channel_factory.h
- src/core/ext/client_config/client_config.h - src/core/ext/client_config/client_config.h
- src/core/ext/client_config/connector.h - src/core/ext/client_config/connector.h
- src/core/ext/client_config/initial_connect_string.h - src/core/ext/client_config/initial_connect_string.h
@ -425,12 +426,12 @@ filegroups:
- src/core/ext/client_config/resolver_factory.h - src/core/ext/client_config/resolver_factory.h
- src/core/ext/client_config/resolver_registry.h - src/core/ext/client_config/resolver_registry.h
- src/core/ext/client_config/subchannel.h - src/core/ext/client_config/subchannel.h
- src/core/ext/client_config/subchannel_factory.h
- src/core/ext/client_config/subchannel_index.h - src/core/ext/client_config/subchannel_index.h
- src/core/ext/client_config/uri_parser.h - src/core/ext/client_config/uri_parser.h
src: src:
- src/core/ext/client_config/channel_connectivity.c - src/core/ext/client_config/channel_connectivity.c
- src/core/ext/client_config/client_channel.c - src/core/ext/client_config/client_channel.c
- src/core/ext/client_config/client_channel_factory.c
- src/core/ext/client_config/client_config.c - src/core/ext/client_config/client_config.c
- src/core/ext/client_config/connector.c - src/core/ext/client_config/connector.c
- src/core/ext/client_config/default_initial_connect_string.c - src/core/ext/client_config/default_initial_connect_string.c
@ -442,7 +443,6 @@ filegroups:
- src/core/ext/client_config/resolver_factory.c - src/core/ext/client_config/resolver_factory.c
- src/core/ext/client_config/resolver_registry.c - src/core/ext/client_config/resolver_registry.c
- src/core/ext/client_config/subchannel.c - src/core/ext/client_config/subchannel.c
- src/core/ext/client_config/subchannel_factory.c
- src/core/ext/client_config/subchannel_index.c - src/core/ext/client_config/subchannel_index.c
- src/core/ext/client_config/uri_parser.c - src/core/ext/client_config/uri_parser.c
- name: grpc_codegen - name: grpc_codegen

@ -91,6 +91,7 @@ if test "$PHP_GRPC" != "no"; then
src/core/ext/census/tracing.c \ src/core/ext/census/tracing.c \
src/core/ext/client_config/channel_connectivity.c \ src/core/ext/client_config/channel_connectivity.c \
src/core/ext/client_config/client_channel.c \ src/core/ext/client_config/client_channel.c \
src/core/ext/client_config/client_channel_factory.c \
src/core/ext/client_config/client_config.c \ src/core/ext/client_config/client_config.c \
src/core/ext/client_config/connector.c \ src/core/ext/client_config/connector.c \
src/core/ext/client_config/default_initial_connect_string.c \ src/core/ext/client_config/default_initial_connect_string.c \
@ -102,7 +103,6 @@ if test "$PHP_GRPC" != "no"; then
src/core/ext/client_config/resolver_factory.c \ src/core/ext/client_config/resolver_factory.c \
src/core/ext/client_config/resolver_registry.c \ src/core/ext/client_config/resolver_registry.c \
src/core/ext/client_config/subchannel.c \ src/core/ext/client_config/subchannel.c \
src/core/ext/client_config/subchannel_factory.c \
src/core/ext/client_config/subchannel_index.c \ src/core/ext/client_config/subchannel_index.c \
src/core/ext/client_config/uri_parser.c \ src/core/ext/client_config/uri_parser.c \
src/core/ext/lb_policy/grpclb/load_balancer_api.c \ src/core/ext/lb_policy/grpclb/load_balancer_api.c \

@ -168,6 +168,7 @@ Pod::Spec.new do |s|
'src/core/ext/census/mlog.h', 'src/core/ext/census/mlog.h',
'src/core/ext/census/rpc_metric_id.h', 'src/core/ext/census/rpc_metric_id.h',
'src/core/ext/client_config/client_channel.h', 'src/core/ext/client_config/client_channel.h',
'src/core/ext/client_config/client_channel_factory.h',
'src/core/ext/client_config/client_config.h', 'src/core/ext/client_config/client_config.h',
'src/core/ext/client_config/connector.h', 'src/core/ext/client_config/connector.h',
'src/core/ext/client_config/initial_connect_string.h', 'src/core/ext/client_config/initial_connect_string.h',
@ -178,7 +179,6 @@ Pod::Spec.new do |s|
'src/core/ext/client_config/resolver_factory.h', 'src/core/ext/client_config/resolver_factory.h',
'src/core/ext/client_config/resolver_registry.h', 'src/core/ext/client_config/resolver_registry.h',
'src/core/ext/client_config/subchannel.h', 'src/core/ext/client_config/subchannel.h',
'src/core/ext/client_config/subchannel_factory.h',
'src/core/ext/client_config/subchannel_index.h', 'src/core/ext/client_config/subchannel_index.h',
'src/core/ext/client_config/uri_parser.h', 'src/core/ext/client_config/uri_parser.h',
'src/core/ext/lb_policy/grpclb/load_balancer_api.h', 'src/core/ext/lb_policy/grpclb/load_balancer_api.h',
@ -320,6 +320,7 @@ Pod::Spec.new do |s|
'src/core/ext/census/tracing.c', 'src/core/ext/census/tracing.c',
'src/core/ext/client_config/channel_connectivity.c', 'src/core/ext/client_config/channel_connectivity.c',
'src/core/ext/client_config/client_channel.c', 'src/core/ext/client_config/client_channel.c',
'src/core/ext/client_config/client_channel_factory.c',
'src/core/ext/client_config/client_config.c', 'src/core/ext/client_config/client_config.c',
'src/core/ext/client_config/connector.c', 'src/core/ext/client_config/connector.c',
'src/core/ext/client_config/default_initial_connect_string.c', 'src/core/ext/client_config/default_initial_connect_string.c',
@ -331,7 +332,6 @@ Pod::Spec.new do |s|
'src/core/ext/client_config/resolver_factory.c', 'src/core/ext/client_config/resolver_factory.c',
'src/core/ext/client_config/resolver_registry.c', 'src/core/ext/client_config/resolver_registry.c',
'src/core/ext/client_config/subchannel.c', 'src/core/ext/client_config/subchannel.c',
'src/core/ext/client_config/subchannel_factory.c',
'src/core/ext/client_config/subchannel_index.c', 'src/core/ext/client_config/subchannel_index.c',
'src/core/ext/client_config/uri_parser.c', 'src/core/ext/client_config/uri_parser.c',
'src/core/ext/lb_policy/grpclb/load_balancer_api.c', 'src/core/ext/lb_policy/grpclb/load_balancer_api.c',
@ -491,6 +491,7 @@ Pod::Spec.new do |s|
'src/core/ext/census/mlog.h', 'src/core/ext/census/mlog.h',
'src/core/ext/census/rpc_metric_id.h', 'src/core/ext/census/rpc_metric_id.h',
'src/core/ext/client_config/client_channel.h', 'src/core/ext/client_config/client_channel.h',
'src/core/ext/client_config/client_channel_factory.h',
'src/core/ext/client_config/client_config.h', 'src/core/ext/client_config/client_config.h',
'src/core/ext/client_config/connector.h', 'src/core/ext/client_config/connector.h',
'src/core/ext/client_config/initial_connect_string.h', 'src/core/ext/client_config/initial_connect_string.h',
@ -501,7 +502,6 @@ Pod::Spec.new do |s|
'src/core/ext/client_config/resolver_factory.h', 'src/core/ext/client_config/resolver_factory.h',
'src/core/ext/client_config/resolver_registry.h', 'src/core/ext/client_config/resolver_registry.h',
'src/core/ext/client_config/subchannel.h', 'src/core/ext/client_config/subchannel.h',
'src/core/ext/client_config/subchannel_factory.h',
'src/core/ext/client_config/subchannel_index.h', 'src/core/ext/client_config/subchannel_index.h',
'src/core/ext/client_config/uri_parser.h', 'src/core/ext/client_config/uri_parser.h',
'src/core/ext/lb_policy/grpclb/load_balancer_api.h', 'src/core/ext/lb_policy/grpclb/load_balancer_api.h',

@ -164,6 +164,7 @@ Gem::Specification.new do |s|
s.files += %w( src/core/ext/census/mlog.h ) s.files += %w( src/core/ext/census/mlog.h )
s.files += %w( src/core/ext/census/rpc_metric_id.h ) s.files += %w( src/core/ext/census/rpc_metric_id.h )
s.files += %w( src/core/ext/client_config/client_channel.h ) s.files += %w( src/core/ext/client_config/client_channel.h )
s.files += %w( src/core/ext/client_config/client_channel_factory.h )
s.files += %w( src/core/ext/client_config/client_config.h ) s.files += %w( src/core/ext/client_config/client_config.h )
s.files += %w( src/core/ext/client_config/connector.h ) s.files += %w( src/core/ext/client_config/connector.h )
s.files += %w( src/core/ext/client_config/initial_connect_string.h ) s.files += %w( src/core/ext/client_config/initial_connect_string.h )
@ -174,7 +175,6 @@ Gem::Specification.new do |s|
s.files += %w( src/core/ext/client_config/resolver_factory.h ) s.files += %w( src/core/ext/client_config/resolver_factory.h )
s.files += %w( src/core/ext/client_config/resolver_registry.h ) s.files += %w( src/core/ext/client_config/resolver_registry.h )
s.files += %w( src/core/ext/client_config/subchannel.h ) s.files += %w( src/core/ext/client_config/subchannel.h )
s.files += %w( src/core/ext/client_config/subchannel_factory.h )
s.files += %w( src/core/ext/client_config/subchannel_index.h ) s.files += %w( src/core/ext/client_config/subchannel_index.h )
s.files += %w( src/core/ext/client_config/uri_parser.h ) s.files += %w( src/core/ext/client_config/uri_parser.h )
s.files += %w( src/core/ext/lb_policy/grpclb/load_balancer_api.h ) s.files += %w( src/core/ext/lb_policy/grpclb/load_balancer_api.h )
@ -303,6 +303,7 @@ Gem::Specification.new do |s|
s.files += %w( src/core/ext/census/tracing.c ) s.files += %w( src/core/ext/census/tracing.c )
s.files += %w( src/core/ext/client_config/channel_connectivity.c ) s.files += %w( src/core/ext/client_config/channel_connectivity.c )
s.files += %w( src/core/ext/client_config/client_channel.c ) s.files += %w( src/core/ext/client_config/client_channel.c )
s.files += %w( src/core/ext/client_config/client_channel_factory.c )
s.files += %w( src/core/ext/client_config/client_config.c ) s.files += %w( src/core/ext/client_config/client_config.c )
s.files += %w( src/core/ext/client_config/connector.c ) s.files += %w( src/core/ext/client_config/connector.c )
s.files += %w( src/core/ext/client_config/default_initial_connect_string.c ) s.files += %w( src/core/ext/client_config/default_initial_connect_string.c )
@ -314,7 +315,6 @@ Gem::Specification.new do |s|
s.files += %w( src/core/ext/client_config/resolver_factory.c ) s.files += %w( src/core/ext/client_config/resolver_factory.c )
s.files += %w( src/core/ext/client_config/resolver_registry.c ) s.files += %w( src/core/ext/client_config/resolver_registry.c )
s.files += %w( src/core/ext/client_config/subchannel.c ) s.files += %w( src/core/ext/client_config/subchannel.c )
s.files += %w( src/core/ext/client_config/subchannel_factory.c )
s.files += %w( src/core/ext/client_config/subchannel_index.c ) s.files += %w( src/core/ext/client_config/subchannel_index.c )
s.files += %w( src/core/ext/client_config/uri_parser.c ) s.files += %w( src/core/ext/client_config/uri_parser.c )
s.files += %w( src/core/ext/lb_policy/grpclb/load_balancer_api.c ) s.files += %w( src/core/ext/lb_policy/grpclb/load_balancer_api.c )

@ -107,6 +107,7 @@
"src/core/ext/census/mlog.h", "src/core/ext/census/mlog.h",
"src/core/ext/census/rpc_metric_id.h", "src/core/ext/census/rpc_metric_id.h",
"src/core/ext/client_config/client_channel.h", "src/core/ext/client_config/client_channel.h",
"src/core/ext/client_config/client_channel_factory.h",
"src/core/ext/client_config/client_config.h", "src/core/ext/client_config/client_config.h",
"src/core/ext/client_config/connector.h", "src/core/ext/client_config/connector.h",
"src/core/ext/client_config/initial_connect_string.h", "src/core/ext/client_config/initial_connect_string.h",
@ -117,7 +118,6 @@
"src/core/ext/client_config/resolver_factory.h", "src/core/ext/client_config/resolver_factory.h",
"src/core/ext/client_config/resolver_registry.h", "src/core/ext/client_config/resolver_registry.h",
"src/core/ext/client_config/subchannel.h", "src/core/ext/client_config/subchannel.h",
"src/core/ext/client_config/subchannel_factory.h",
"src/core/ext/client_config/subchannel_index.h", "src/core/ext/client_config/subchannel_index.h",
"src/core/ext/client_config/uri_parser.h", "src/core/ext/client_config/uri_parser.h",
"src/core/ext/lb_policy/grpclb/load_balancer_api.h", "src/core/ext/lb_policy/grpclb/load_balancer_api.h",
@ -246,6 +246,7 @@
"src/core/ext/census/tracing.c", "src/core/ext/census/tracing.c",
"src/core/ext/client_config/channel_connectivity.c", "src/core/ext/client_config/channel_connectivity.c",
"src/core/ext/client_config/client_channel.c", "src/core/ext/client_config/client_channel.c",
"src/core/ext/client_config/client_channel_factory.c",
"src/core/ext/client_config/client_config.c", "src/core/ext/client_config/client_config.c",
"src/core/ext/client_config/connector.c", "src/core/ext/client_config/connector.c",
"src/core/ext/client_config/default_initial_connect_string.c", "src/core/ext/client_config/default_initial_connect_string.c",
@ -257,7 +258,6 @@
"src/core/ext/client_config/resolver_factory.c", "src/core/ext/client_config/resolver_factory.c",
"src/core/ext/client_config/resolver_registry.c", "src/core/ext/client_config/resolver_registry.c",
"src/core/ext/client_config/subchannel.c", "src/core/ext/client_config/subchannel.c",
"src/core/ext/client_config/subchannel_factory.c",
"src/core/ext/client_config/subchannel_index.c", "src/core/ext/client_config/subchannel_index.c",
"src/core/ext/client_config/uri_parser.c", "src/core/ext/client_config/uri_parser.c",
"src/core/ext/lb_policy/grpclb/load_balancer_api.c", "src/core/ext/lb_policy/grpclb/load_balancer_api.c",

@ -168,6 +168,7 @@
<file baseinstalldir="/" name="src/core/ext/census/mlog.h" role="src" /> <file baseinstalldir="/" name="src/core/ext/census/mlog.h" role="src" />
<file baseinstalldir="/" name="src/core/ext/census/rpc_metric_id.h" role="src" /> <file baseinstalldir="/" name="src/core/ext/census/rpc_metric_id.h" role="src" />
<file baseinstalldir="/" name="src/core/ext/client_config/client_channel.h" role="src" /> <file baseinstalldir="/" name="src/core/ext/client_config/client_channel.h" role="src" />
<file baseinstalldir="/" name="src/core/ext/client_config/client_channel_factory.h" role="src" />
<file baseinstalldir="/" name="src/core/ext/client_config/client_config.h" role="src" /> <file baseinstalldir="/" name="src/core/ext/client_config/client_config.h" role="src" />
<file baseinstalldir="/" name="src/core/ext/client_config/connector.h" role="src" /> <file baseinstalldir="/" name="src/core/ext/client_config/connector.h" role="src" />
<file baseinstalldir="/" name="src/core/ext/client_config/initial_connect_string.h" role="src" /> <file baseinstalldir="/" name="src/core/ext/client_config/initial_connect_string.h" role="src" />
@ -178,7 +179,6 @@
<file baseinstalldir="/" name="src/core/ext/client_config/resolver_factory.h" role="src" /> <file baseinstalldir="/" name="src/core/ext/client_config/resolver_factory.h" role="src" />
<file baseinstalldir="/" name="src/core/ext/client_config/resolver_registry.h" role="src" /> <file baseinstalldir="/" name="src/core/ext/client_config/resolver_registry.h" role="src" />
<file baseinstalldir="/" name="src/core/ext/client_config/subchannel.h" role="src" /> <file baseinstalldir="/" name="src/core/ext/client_config/subchannel.h" role="src" />
<file baseinstalldir="/" name="src/core/ext/client_config/subchannel_factory.h" role="src" />
<file baseinstalldir="/" name="src/core/ext/client_config/subchannel_index.h" role="src" /> <file baseinstalldir="/" name="src/core/ext/client_config/subchannel_index.h" role="src" />
<file baseinstalldir="/" name="src/core/ext/client_config/uri_parser.h" role="src" /> <file baseinstalldir="/" name="src/core/ext/client_config/uri_parser.h" role="src" />
<file baseinstalldir="/" name="src/core/ext/lb_policy/grpclb/load_balancer_api.h" role="src" /> <file baseinstalldir="/" name="src/core/ext/lb_policy/grpclb/load_balancer_api.h" role="src" />
@ -307,6 +307,7 @@
<file baseinstalldir="/" name="src/core/ext/census/tracing.c" role="src" /> <file baseinstalldir="/" name="src/core/ext/census/tracing.c" role="src" />
<file baseinstalldir="/" name="src/core/ext/client_config/channel_connectivity.c" role="src" /> <file baseinstalldir="/" name="src/core/ext/client_config/channel_connectivity.c" role="src" />
<file baseinstalldir="/" name="src/core/ext/client_config/client_channel.c" role="src" /> <file baseinstalldir="/" name="src/core/ext/client_config/client_channel.c" role="src" />
<file baseinstalldir="/" name="src/core/ext/client_config/client_channel_factory.c" role="src" />
<file baseinstalldir="/" name="src/core/ext/client_config/client_config.c" role="src" /> <file baseinstalldir="/" name="src/core/ext/client_config/client_config.c" role="src" />
<file baseinstalldir="/" name="src/core/ext/client_config/connector.c" role="src" /> <file baseinstalldir="/" name="src/core/ext/client_config/connector.c" role="src" />
<file baseinstalldir="/" name="src/core/ext/client_config/default_initial_connect_string.c" role="src" /> <file baseinstalldir="/" name="src/core/ext/client_config/default_initial_connect_string.c" role="src" />
@ -318,7 +319,6 @@
<file baseinstalldir="/" name="src/core/ext/client_config/resolver_factory.c" role="src" /> <file baseinstalldir="/" name="src/core/ext/client_config/resolver_factory.c" role="src" />
<file baseinstalldir="/" name="src/core/ext/client_config/resolver_registry.c" role="src" /> <file baseinstalldir="/" name="src/core/ext/client_config/resolver_registry.c" role="src" />
<file baseinstalldir="/" name="src/core/ext/client_config/subchannel.c" role="src" /> <file baseinstalldir="/" name="src/core/ext/client_config/subchannel.c" role="src" />
<file baseinstalldir="/" name="src/core/ext/client_config/subchannel_factory.c" role="src" />
<file baseinstalldir="/" name="src/core/ext/client_config/subchannel_index.c" role="src" /> <file baseinstalldir="/" name="src/core/ext/client_config/subchannel_index.c" role="src" />
<file baseinstalldir="/" name="src/core/ext/client_config/uri_parser.c" role="src" /> <file baseinstalldir="/" name="src/core/ext/client_config/uri_parser.c" role="src" />
<file baseinstalldir="/" name="src/core/ext/lb_policy/grpclb/load_balancer_api.c" role="src" /> <file baseinstalldir="/" name="src/core/ext/lb_policy/grpclb/load_balancer_api.c" role="src" />

@ -40,7 +40,7 @@ decisions (for example, by avoiding disconnected backends).
Configured sub-channels are fully setup to participate in the grpc data plane. Configured sub-channels are fully setup to participate in the grpc data plane.
Their behavior is specified by a set of grpc channel filters defined at their Their behavior is specified by a set of grpc channel filters defined at their
construction. To customize this behavior, resolvers build construction. To customize this behavior, resolvers build
grpc_subchannel_factory objects, which use the decorator pattern to customize grpc_client_channel_factory objects, which use the decorator pattern to customize
construction arguments for concrete grpc_subchannel instances. construction arguments for concrete grpc_subchannel instances.

@ -0,0 +1,57 @@
/*
*
* Copyright 2015, Google Inc.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
* met:
*
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following disclaimer
* in the documentation and/or other materials provided with the
* distribution.
* * Neither the name of Google Inc. nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*/
#include "src/core/ext/client_config/client_channel_factory.h"
void grpc_client_channel_factory_ref(grpc_client_channel_factory* factory) {
factory->vtable->ref(factory);
}
void grpc_client_channel_factory_unref(grpc_exec_ctx* exec_ctx,
grpc_client_channel_factory* factory) {
factory->vtable->unref(exec_ctx, factory);
}
grpc_subchannel* grpc_client_channel_factory_create_subchannel(
grpc_exec_ctx* exec_ctx, grpc_client_channel_factory* factory,
grpc_subchannel_args* args) {
return factory->vtable->create_subchannel(exec_ctx, factory, args);
}
grpc_channel* grpc_client_channel_factory_create_channel(
grpc_exec_ctx* exec_ctx, grpc_client_channel_factory* factory,
const char* target, grpc_client_channel_type type,
grpc_channel_args* args) {
return factory->vtable->create_client_channel(exec_ctx, factory, target, type,
args);
}

@ -0,0 +1,86 @@
/*
*
* Copyright 2015, Google Inc.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
* met:
*
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following disclaimer
* in the documentation and/or other materials provided with the
* distribution.
* * Neither the name of Google Inc. nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*/
#ifndef GRPC_CORE_LIB_CLIENT_CONFIG_CLIENT_CHANNEL_FACTORY_H
#define GRPC_CORE_LIB_CLIENT_CONFIG_CLIENT_CHANNEL_FACTORY_H
#include <grpc/grpc_security.h>
#include <grpc/impl/codegen/grpc_types.h>
#include "src/core/ext/client_config/subchannel.h"
#include "src/core/lib/channel/channel_stack.h"
typedef struct grpc_client_channel_factory grpc_client_channel_factory;
typedef struct grpc_client_channel_factory_vtable
grpc_client_channel_factory_vtable;
typedef enum {
GRPC_CLIENT_CHANNEL_TYPE_REGULAR, /** for the user-level regular calls */
GRPC_CLIENT_CHANNEL_TYPE_LOAD_BALANCING, /** for communication with a load
balancing service */
} grpc_client_channel_type;
/** Constructor for new configured channels.
Creating decorators around this type is encouraged to adapt behavior. */
struct grpc_client_channel_factory {
const grpc_client_channel_factory_vtable *vtable;
};
struct grpc_client_channel_factory_vtable {
void (*ref)(grpc_client_channel_factory *factory);
void (*unref)(grpc_exec_ctx *exec_ctx, grpc_client_channel_factory *factory);
grpc_subchannel *(*create_subchannel)(grpc_exec_ctx *exec_ctx,
grpc_client_channel_factory *factory,
grpc_subchannel_args *args);
grpc_channel *(*create_client_channel)(grpc_exec_ctx *exec_ctx,
grpc_client_channel_factory *factory,
const char *target,
grpc_client_channel_type type,
grpc_channel_args *args);
};
void grpc_client_channel_factory_ref(grpc_client_channel_factory *factory);
void grpc_client_channel_factory_unref(grpc_exec_ctx *exec_ctx,
grpc_client_channel_factory *factory);
/** Create a new grpc_subchannel */
grpc_subchannel *grpc_client_channel_factory_create_subchannel(
grpc_exec_ctx *exec_ctx, grpc_client_channel_factory *factory,
grpc_subchannel_args *args);
/** Create a new grpc_channel */
grpc_channel *grpc_client_channel_factory_create_channel(
grpc_exec_ctx *exec_ctx, grpc_client_channel_factory *factory,
const char *target, grpc_client_channel_type type, grpc_channel_args *args);
#endif /* GRPC_CORE_LIB_CLIENT_CONFIG_CLIENT_CHANNEL_FACTORY_H */

@ -34,8 +34,8 @@
#ifndef GRPC_CORE_EXT_CLIENT_CONFIG_LB_POLICY_FACTORY_H #ifndef GRPC_CORE_EXT_CLIENT_CONFIG_LB_POLICY_FACTORY_H
#define GRPC_CORE_EXT_CLIENT_CONFIG_LB_POLICY_FACTORY_H #define GRPC_CORE_EXT_CLIENT_CONFIG_LB_POLICY_FACTORY_H
#include "src/core/ext/client_config/client_channel_factory.h"
#include "src/core/ext/client_config/lb_policy.h" #include "src/core/ext/client_config/lb_policy.h"
#include "src/core/ext/client_config/subchannel_factory.h"
#include "src/core/lib/iomgr/resolve_address.h" #include "src/core/lib/iomgr/resolve_address.h"
#include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/exec_ctx.h"
@ -51,7 +51,7 @@ struct grpc_lb_policy_factory {
typedef struct grpc_lb_policy_args { typedef struct grpc_lb_policy_args {
grpc_resolved_addresses *addresses; grpc_resolved_addresses *addresses;
grpc_subchannel_factory *subchannel_factory; grpc_client_channel_factory *client_channel_factory;
} grpc_lb_policy_args; } grpc_lb_policy_args;
struct grpc_lb_policy_factory_vtable { struct grpc_lb_policy_factory_vtable {

@ -34,8 +34,8 @@
#ifndef GRPC_CORE_EXT_CLIENT_CONFIG_RESOLVER_FACTORY_H #ifndef GRPC_CORE_EXT_CLIENT_CONFIG_RESOLVER_FACTORY_H
#define GRPC_CORE_EXT_CLIENT_CONFIG_RESOLVER_FACTORY_H #define GRPC_CORE_EXT_CLIENT_CONFIG_RESOLVER_FACTORY_H
#include "src/core/ext/client_config/client_channel_factory.h"
#include "src/core/ext/client_config/resolver.h" #include "src/core/ext/client_config/resolver.h"
#include "src/core/ext/client_config/subchannel_factory.h"
#include "src/core/ext/client_config/uri_parser.h" #include "src/core/ext/client_config/uri_parser.h"
typedef struct grpc_resolver_factory grpc_resolver_factory; typedef struct grpc_resolver_factory grpc_resolver_factory;
@ -49,7 +49,7 @@ struct grpc_resolver_factory {
typedef struct grpc_resolver_args { typedef struct grpc_resolver_args {
grpc_uri *uri; grpc_uri *uri;
grpc_subchannel_factory *subchannel_factory; grpc_client_channel_factory *client_channel_factory;
} grpc_resolver_args; } grpc_resolver_args;
struct grpc_resolver_factory_vtable { struct grpc_resolver_factory_vtable {

@ -123,14 +123,14 @@ static grpc_resolver_factory *resolve_factory(const char *target,
} }
grpc_resolver *grpc_resolver_create( grpc_resolver *grpc_resolver_create(
const char *target, grpc_subchannel_factory *subchannel_factory) { const char *target, grpc_client_channel_factory *client_channel_factory) {
grpc_uri *uri = NULL; grpc_uri *uri = NULL;
grpc_resolver_factory *factory = resolve_factory(target, &uri); grpc_resolver_factory *factory = resolve_factory(target, &uri);
grpc_resolver *resolver; grpc_resolver *resolver;
grpc_resolver_args args; grpc_resolver_args args;
memset(&args, 0, sizeof(args)); memset(&args, 0, sizeof(args));
args.uri = uri; args.uri = uri;
args.subchannel_factory = subchannel_factory; args.client_channel_factory = client_channel_factory;
resolver = grpc_resolver_factory_create_resolver(factory, &args); resolver = grpc_resolver_factory_create_resolver(factory, &args);
grpc_uri_destroy(uri); grpc_uri_destroy(uri);
return resolver; return resolver;

@ -56,7 +56,7 @@ void grpc_register_resolver_type(grpc_resolver_factory *factory);
return it. return it.
If a resolver factory was not found, return NULL. */ If a resolver factory was not found, return NULL. */
grpc_resolver *grpc_resolver_create( grpc_resolver *grpc_resolver_create(
const char *target, grpc_subchannel_factory *subchannel_factory); const char *target, grpc_client_channel_factory *client_channel_factory);
/** Find a resolver factory given a name and return an (owned-by-the-caller) /** Find a resolver factory given a name and return an (owned-by-the-caller)
* reference to it */ * reference to it */

@ -395,7 +395,7 @@ static grpc_lb_policy *create_pick_first(grpc_exec_ctx *exec_ctx,
grpc_lb_policy_factory *factory, grpc_lb_policy_factory *factory,
grpc_lb_policy_args *args) { grpc_lb_policy_args *args) {
GPR_ASSERT(args->addresses != NULL); GPR_ASSERT(args->addresses != NULL);
GPR_ASSERT(args->subchannel_factory != NULL); GPR_ASSERT(args->client_channel_factory != NULL);
if (args->addresses->naddrs == 0) return NULL; if (args->addresses->naddrs == 0) return NULL;
@ -412,8 +412,8 @@ static grpc_lb_policy *create_pick_first(grpc_exec_ctx *exec_ctx,
sc_args.addr = (struct sockaddr *)(args->addresses->addrs[i].addr); sc_args.addr = (struct sockaddr *)(args->addresses->addrs[i].addr);
sc_args.addr_len = (size_t)args->addresses->addrs[i].len; sc_args.addr_len = (size_t)args->addresses->addrs[i].len;
grpc_subchannel *subchannel = grpc_subchannel_factory_create_subchannel( grpc_subchannel *subchannel = grpc_client_channel_factory_create_subchannel(
exec_ctx, args->subchannel_factory, &sc_args); exec_ctx, args->client_channel_factory, &sc_args);
if (subchannel != NULL) { if (subchannel != NULL) {
p->subchannels[subchannel_idx++] = subchannel; p->subchannels[subchannel_idx++] = subchannel;

@ -502,7 +502,7 @@ static grpc_lb_policy *create_round_robin(grpc_exec_ctx *exec_ctx,
grpc_lb_policy_factory *factory, grpc_lb_policy_factory *factory,
grpc_lb_policy_args *args) { grpc_lb_policy_args *args) {
GPR_ASSERT(args->addresses != NULL); GPR_ASSERT(args->addresses != NULL);
GPR_ASSERT(args->subchannel_factory != NULL); GPR_ASSERT(args->client_channel_factory != NULL);
round_robin_lb_policy *p = gpr_malloc(sizeof(*p)); round_robin_lb_policy *p = gpr_malloc(sizeof(*p));
memset(p, 0, sizeof(*p)); memset(p, 0, sizeof(*p));
@ -518,8 +518,8 @@ static grpc_lb_policy *create_round_robin(grpc_exec_ctx *exec_ctx,
sc_args.addr = (struct sockaddr *)(args->addresses->addrs[i].addr); sc_args.addr = (struct sockaddr *)(args->addresses->addrs[i].addr);
sc_args.addr_len = (size_t)args->addresses->addrs[i].len; sc_args.addr_len = (size_t)args->addresses->addrs[i].len;
grpc_subchannel *subchannel = grpc_subchannel_factory_create_subchannel( grpc_subchannel *subchannel = grpc_client_channel_factory_create_subchannel(
exec_ctx, args->subchannel_factory, &sc_args); exec_ctx, args->client_channel_factory, &sc_args);
if (subchannel != NULL) { if (subchannel != NULL) {
subchannel_data *sd = gpr_malloc(sizeof(*sd)); subchannel_data *sd = gpr_malloc(sizeof(*sd));

@ -59,7 +59,7 @@ typedef struct {
/** default port to use */ /** default port to use */
char *default_port; char *default_port;
/** subchannel factory */ /** subchannel factory */
grpc_subchannel_factory *subchannel_factory; grpc_client_channel_factory *client_channel_factory;
/** load balancing policy name */ /** load balancing policy name */
char *lb_policy_name; char *lb_policy_name;
@ -170,7 +170,7 @@ static void dns_on_resolved(grpc_exec_ctx *exec_ctx, void *arg,
config = grpc_client_config_create(); config = grpc_client_config_create();
memset(&lb_policy_args, 0, sizeof(lb_policy_args)); memset(&lb_policy_args, 0, sizeof(lb_policy_args));
lb_policy_args.addresses = addresses; lb_policy_args.addresses = addresses;
lb_policy_args.subchannel_factory = r->subchannel_factory; lb_policy_args.client_channel_factory = r->client_channel_factory;
lb_policy = lb_policy =
grpc_lb_policy_create(exec_ctx, r->lb_policy_name, &lb_policy_args); grpc_lb_policy_create(exec_ctx, r->lb_policy_name, &lb_policy_args);
if (lb_policy != NULL) { if (lb_policy != NULL) {
@ -228,7 +228,7 @@ static void dns_destroy(grpc_exec_ctx *exec_ctx, grpc_resolver *gr) {
if (r->resolved_config) { if (r->resolved_config) {
grpc_client_config_unref(exec_ctx, r->resolved_config); grpc_client_config_unref(exec_ctx, r->resolved_config);
} }
grpc_subchannel_factory_unref(exec_ctx, r->subchannel_factory); grpc_client_channel_factory_unref(exec_ctx, r->client_channel_factory);
gpr_free(r->name); gpr_free(r->name);
gpr_free(r->default_port); gpr_free(r->default_port);
gpr_free(r->lb_policy_name); gpr_free(r->lb_policy_name);
@ -255,10 +255,10 @@ static grpc_resolver *dns_create(grpc_resolver_args *args,
grpc_resolver_init(&r->base, &dns_resolver_vtable); grpc_resolver_init(&r->base, &dns_resolver_vtable);
r->name = gpr_strdup(path); r->name = gpr_strdup(path);
r->default_port = gpr_strdup(default_port); r->default_port = gpr_strdup(default_port);
r->subchannel_factory = args->subchannel_factory; r->client_channel_factory = args->client_channel_factory;
gpr_backoff_init(&r->backoff_state, BACKOFF_MULTIPLIER, BACKOFF_JITTER, gpr_backoff_init(&r->backoff_state, BACKOFF_MULTIPLIER, BACKOFF_JITTER,
BACKOFF_MIN_SECONDS * 1000, BACKOFF_MAX_SECONDS * 1000); BACKOFF_MIN_SECONDS * 1000, BACKOFF_MAX_SECONDS * 1000);
grpc_subchannel_factory_ref(r->subchannel_factory); grpc_client_channel_factory_ref(r->client_channel_factory);
r->lb_policy_name = gpr_strdup(lb_policy_name); r->lb_policy_name = gpr_strdup(lb_policy_name);
return &r->base; return &r->base;
} }

@ -52,7 +52,7 @@ typedef struct {
/** refcount */ /** refcount */
gpr_refcount refs; gpr_refcount refs;
/** subchannel factory */ /** subchannel factory */
grpc_subchannel_factory *subchannel_factory; grpc_client_channel_factory *client_channel_factory;
/** load balancing policy name */ /** load balancing policy name */
char *lb_policy_name; char *lb_policy_name;
@ -125,7 +125,7 @@ static void sockaddr_maybe_finish_next_locked(grpc_exec_ctx *exec_ctx,
grpc_lb_policy_args lb_policy_args; grpc_lb_policy_args lb_policy_args;
memset(&lb_policy_args, 0, sizeof(lb_policy_args)); memset(&lb_policy_args, 0, sizeof(lb_policy_args));
lb_policy_args.addresses = r->addresses; lb_policy_args.addresses = r->addresses;
lb_policy_args.subchannel_factory = r->subchannel_factory; lb_policy_args.client_channel_factory = r->client_channel_factory;
grpc_lb_policy *lb_policy = grpc_lb_policy *lb_policy =
grpc_lb_policy_create(exec_ctx, r->lb_policy_name, &lb_policy_args); grpc_lb_policy_create(exec_ctx, r->lb_policy_name, &lb_policy_args);
grpc_client_config_set_lb_policy(cfg, lb_policy); grpc_client_config_set_lb_policy(cfg, lb_policy);
@ -140,7 +140,7 @@ static void sockaddr_maybe_finish_next_locked(grpc_exec_ctx *exec_ctx,
static void sockaddr_destroy(grpc_exec_ctx *exec_ctx, grpc_resolver *gr) { static void sockaddr_destroy(grpc_exec_ctx *exec_ctx, grpc_resolver *gr) {
sockaddr_resolver *r = (sockaddr_resolver *)gr; sockaddr_resolver *r = (sockaddr_resolver *)gr;
gpr_mu_destroy(&r->mu); gpr_mu_destroy(&r->mu);
grpc_subchannel_factory_unref(exec_ctx, r->subchannel_factory); grpc_client_channel_factory_unref(exec_ctx, r->client_channel_factory);
grpc_resolved_addresses_destroy(r->addresses); grpc_resolved_addresses_destroy(r->addresses);
gpr_free(r->lb_policy_name); gpr_free(r->lb_policy_name);
gpr_free(r); gpr_free(r);
@ -318,8 +318,8 @@ static grpc_resolver *sockaddr_create(
gpr_ref_init(&r->refs, 1); gpr_ref_init(&r->refs, 1);
gpr_mu_init(&r->mu); gpr_mu_init(&r->mu);
grpc_resolver_init(&r->base, &sockaddr_resolver_vtable); grpc_resolver_init(&r->base, &sockaddr_resolver_vtable);
r->subchannel_factory = args->subchannel_factory; r->client_channel_factory = args->client_channel_factory;
grpc_subchannel_factory_ref(r->subchannel_factory); grpc_client_channel_factory_ref(r->client_channel_factory);
return &r->base; return &r->base;
} }

@ -57,7 +57,7 @@ typedef struct {
/** name to resolve */ /** name to resolve */
char *name; char *name;
/** subchannel factory */ /** subchannel factory */
grpc_subchannel_factory *subchannel_factory; grpc_client_channel_factory *client_channel_factory;
/** load balancing policy name */ /** load balancing policy name */
char *lb_policy_name; char *lb_policy_name;
@ -187,9 +187,8 @@ static void zookeeper_on_resolved(grpc_exec_ctx *exec_ctx, void *arg,
if (addresses != NULL) { if (addresses != NULL) {
grpc_lb_policy_args lb_policy_args; grpc_lb_policy_args lb_policy_args;
config = grpc_client_config_create(); config = grpc_client_config_create();
lb_policy_args.addresses = addresses; lb_policy_args.addresses = addresses;
lb_policy_args.subchannel_factory = r->subchannel_factory; lb_policy_args.client_channel_factory = r->client_channel_factory;
lb_policy = lb_policy =
grpc_lb_policy_create(exec_ctx, r->lb_policy_name, &lb_policy_args); grpc_lb_policy_create(exec_ctx, r->lb_policy_name, &lb_policy_args);
@ -424,7 +423,7 @@ static void zookeeper_destroy(grpc_exec_ctx *exec_ctx, grpc_resolver *gr) {
if (r->resolved_config != NULL) { if (r->resolved_config != NULL) {
grpc_client_config_unref(exec_ctx, r->resolved_config); grpc_client_config_unref(exec_ctx, r->resolved_config);
} }
grpc_subchannel_factory_unref(exec_ctx, r->subchannel_factory); grpc_client_channel_factory_unref(exec_ctx, r->client_channel_factory);
gpr_free(r->name); gpr_free(r->name);
gpr_free(r->lb_policy_name); gpr_free(r->lb_policy_name);
gpr_free(r); gpr_free(r);
@ -454,8 +453,8 @@ static grpc_resolver *zookeeper_create(grpc_resolver_args *args,
grpc_resolver_init(&r->base, &zookeeper_resolver_vtable); grpc_resolver_init(&r->base, &zookeeper_resolver_vtable);
r->name = gpr_strdup(path); r->name = gpr_strdup(path);
r->subchannel_factory = args->subchannel_factory; r->client_channel_factory = args->client_channel_factory;
grpc_subchannel_factory_ref(r->subchannel_factory); grpc_client_channel_factory_ref(r->client_channel_factory);
r->lb_policy_name = gpr_strdup(lb_policy_name); r->lb_policy_name = gpr_strdup(lb_policy_name);

@ -136,31 +136,35 @@ static const grpc_connector_vtable connector_vtable = {
connector_ref, connector_unref, connector_shutdown, connector_connect}; connector_ref, connector_unref, connector_shutdown, connector_connect};
typedef struct { typedef struct {
grpc_subchannel_factory base; grpc_client_channel_factory base;
gpr_refcount refs; gpr_refcount refs;
grpc_channel_args *merge_args; grpc_channel_args *merge_args;
grpc_channel *master; grpc_channel *master;
} subchannel_factory; } client_channel_factory;
static void subchannel_factory_ref(grpc_subchannel_factory *scf) { static void client_channel_factory_ref(
subchannel_factory *f = (subchannel_factory *)scf; grpc_client_channel_factory *cc_factory) {
client_channel_factory *f = (client_channel_factory *)cc_factory;
gpr_ref(&f->refs); gpr_ref(&f->refs);
} }
static void subchannel_factory_unref(grpc_exec_ctx *exec_ctx, static void client_channel_factory_unref(
grpc_subchannel_factory *scf) { grpc_exec_ctx *exec_ctx, grpc_client_channel_factory *cc_factory) {
subchannel_factory *f = (subchannel_factory *)scf; client_channel_factory *f = (client_channel_factory *)cc_factory;
if (gpr_unref(&f->refs)) { if (gpr_unref(&f->refs)) {
GRPC_CHANNEL_INTERNAL_UNREF(exec_ctx, f->master, "subchannel_factory"); if (f->master != NULL) {
GRPC_CHANNEL_INTERNAL_UNREF(exec_ctx, f->master,
"client_channel_factory");
}
grpc_channel_args_destroy(f->merge_args); grpc_channel_args_destroy(f->merge_args);
gpr_free(f); gpr_free(f);
} }
} }
static grpc_subchannel *subchannel_factory_create_subchannel( static grpc_subchannel *client_channel_factory_create_subchannel(
grpc_exec_ctx *exec_ctx, grpc_subchannel_factory *scf, grpc_exec_ctx *exec_ctx, grpc_client_channel_factory *cc_factory,
grpc_subchannel_args *args) { grpc_subchannel_args *args) {
subchannel_factory *f = (subchannel_factory *)scf; client_channel_factory *f = (client_channel_factory *)cc_factory;
connector *c = gpr_malloc(sizeof(*c)); connector *c = gpr_malloc(sizeof(*c));
grpc_channel_args *final_args = grpc_channel_args *final_args =
grpc_channel_args_merge(args->args, f->merge_args); grpc_channel_args_merge(args->args, f->merge_args);
@ -175,9 +179,33 @@ static grpc_subchannel *subchannel_factory_create_subchannel(
return s; return s;
} }
static const grpc_subchannel_factory_vtable subchannel_factory_vtable = { static grpc_channel *client_channel_factory_create_channel(
subchannel_factory_ref, subchannel_factory_unref, grpc_exec_ctx *exec_ctx, grpc_client_channel_factory *cc_factory,
subchannel_factory_create_subchannel}; const char *target, grpc_client_channel_type type,
grpc_channel_args *args) {
client_channel_factory *f = (client_channel_factory *)cc_factory;
grpc_channel_args *final_args = grpc_channel_args_merge(args, f->merge_args);
grpc_channel *channel = grpc_channel_create(exec_ctx, target, final_args,
GRPC_CLIENT_CHANNEL, NULL);
grpc_channel_args_destroy(final_args);
grpc_resolver *resolver = grpc_resolver_create(target, &f->base);
if (!resolver) {
GRPC_CHANNEL_INTERNAL_UNREF(exec_ctx, channel,
"client_channel_factory_create_channel");
return NULL;
}
grpc_client_channel_set_resolver(
exec_ctx, grpc_channel_get_channel_stack(channel), resolver);
GRPC_RESOLVER_UNREF(exec_ctx, resolver, "create_channel");
return channel;
}
static const grpc_client_channel_factory_vtable client_channel_factory_vtable =
{client_channel_factory_ref, client_channel_factory_unref,
client_channel_factory_create_subchannel,
client_channel_factory_create_channel};
/* Create a client channel: /* Create a client channel:
Asynchronously: - resolve target Asynchronously: - resolve target
@ -186,38 +214,27 @@ static const grpc_subchannel_factory_vtable subchannel_factory_vtable = {
grpc_channel *grpc_insecure_channel_create(const char *target, grpc_channel *grpc_insecure_channel_create(const char *target,
const grpc_channel_args *args, const grpc_channel_args *args,
void *reserved) { void *reserved) {
grpc_channel *channel = NULL;
grpc_resolver *resolver;
subchannel_factory *f;
grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT;
GRPC_API_TRACE( GRPC_API_TRACE(
"grpc_insecure_channel_create(target=%p, args=%p, reserved=%p)", 3, "grpc_insecure_channel_create(target=%p, args=%p, reserved=%p)", 3,
(target, args, reserved)); (target, args, reserved));
GPR_ASSERT(!reserved); GPR_ASSERT(!reserved);
channel = client_channel_factory *f = gpr_malloc(sizeof(*f));
grpc_channel_create(&exec_ctx, target, args, GRPC_CLIENT_CHANNEL, NULL); memset(f, 0, sizeof(*f));
f->base.vtable = &client_channel_factory_vtable;
f = gpr_malloc(sizeof(*f));
f->base.vtable = &subchannel_factory_vtable;
gpr_ref_init(&f->refs, 1); gpr_ref_init(&f->refs, 1);
f->merge_args = grpc_channel_args_copy(args); f->merge_args = grpc_channel_args_copy(args);
f->master = channel;
GRPC_CHANNEL_INTERNAL_REF(f->master, "subchannel_factory");
resolver = grpc_resolver_create(target, &f->base);
if (!resolver) {
GRPC_CHANNEL_INTERNAL_UNREF(&exec_ctx, f->master, "subchannel_factory");
grpc_subchannel_factory_unref(&exec_ctx, &f->base);
grpc_exec_ctx_finish(&exec_ctx);
return NULL;
}
grpc_client_channel_set_resolver( grpc_channel *channel = client_channel_factory_create_channel(
&exec_ctx, grpc_channel_get_channel_stack(channel), resolver); &exec_ctx, &f->base, target, GRPC_CLIENT_CHANNEL_TYPE_REGULAR, NULL);
GRPC_RESOLVER_UNREF(&exec_ctx, resolver, "create"); if (channel != NULL) {
grpc_subchannel_factory_unref(&exec_ctx, &f->base); f->master = channel;
GRPC_CHANNEL_INTERNAL_REF(f->master, "grpc_insecure_channel_create");
}
grpc_client_channel_factory_unref(&exec_ctx, &f->base);
grpc_exec_ctx_finish(&exec_ctx); grpc_exec_ctx_finish(&exec_ctx);
return channel; return channel; /* may be NULL */
} }

@ -192,34 +192,38 @@ static const grpc_connector_vtable connector_vtable = {
connector_ref, connector_unref, connector_shutdown, connector_connect}; connector_ref, connector_unref, connector_shutdown, connector_connect};
typedef struct { typedef struct {
grpc_subchannel_factory base; grpc_client_channel_factory base;
gpr_refcount refs; gpr_refcount refs;
grpc_channel_args *merge_args; grpc_channel_args *merge_args;
grpc_channel_security_connector *security_connector; grpc_channel_security_connector *security_connector;
grpc_channel *master; grpc_channel *master;
} subchannel_factory; } client_channel_factory;
static void subchannel_factory_ref(grpc_subchannel_factory *scf) { static void client_channel_factory_ref(
subchannel_factory *f = (subchannel_factory *)scf; grpc_client_channel_factory *cc_factory) {
client_channel_factory *f = (client_channel_factory *)cc_factory;
gpr_ref(&f->refs); gpr_ref(&f->refs);
} }
static void subchannel_factory_unref(grpc_exec_ctx *exec_ctx, static void client_channel_factory_unref(
grpc_subchannel_factory *scf) { grpc_exec_ctx *exec_ctx, grpc_client_channel_factory *cc_factory) {
subchannel_factory *f = (subchannel_factory *)scf; client_channel_factory *f = (client_channel_factory *)cc_factory;
if (gpr_unref(&f->refs)) { if (gpr_unref(&f->refs)) {
GRPC_SECURITY_CONNECTOR_UNREF(&f->security_connector->base, GRPC_SECURITY_CONNECTOR_UNREF(&f->security_connector->base,
"subchannel_factory"); "client_channel_factory");
GRPC_CHANNEL_INTERNAL_UNREF(exec_ctx, f->master, "subchannel_factory"); if (f->master != NULL) {
GRPC_CHANNEL_INTERNAL_UNREF(exec_ctx, f->master,
"client_channel_factory");
}
grpc_channel_args_destroy(f->merge_args); grpc_channel_args_destroy(f->merge_args);
gpr_free(f); gpr_free(f);
} }
} }
static grpc_subchannel *subchannel_factory_create_subchannel( static grpc_subchannel *client_channel_factory_create_subchannel(
grpc_exec_ctx *exec_ctx, grpc_subchannel_factory *scf, grpc_exec_ctx *exec_ctx, grpc_client_channel_factory *cc_factory,
grpc_subchannel_args *args) { grpc_subchannel_args *args) {
subchannel_factory *f = (subchannel_factory *)scf; client_channel_factory *f = (client_channel_factory *)cc_factory;
connector *c = gpr_malloc(sizeof(*c)); connector *c = gpr_malloc(sizeof(*c));
grpc_channel_args *final_args = grpc_channel_args *final_args =
grpc_channel_args_merge(args->args, f->merge_args); grpc_channel_args_merge(args->args, f->merge_args);
@ -236,9 +240,37 @@ static grpc_subchannel *subchannel_factory_create_subchannel(
return s; return s;
} }
static const grpc_subchannel_factory_vtable subchannel_factory_vtable = { static grpc_channel *client_channel_factory_create_channel(
subchannel_factory_ref, subchannel_factory_unref, grpc_exec_ctx *exec_ctx, grpc_client_channel_factory *cc_factory,
subchannel_factory_create_subchannel}; const char *target, grpc_client_channel_type type,
grpc_channel_args *args) {
client_channel_factory *f = (client_channel_factory *)cc_factory;
grpc_channel_args *final_args = grpc_channel_args_merge(args, f->merge_args);
grpc_channel *channel = grpc_channel_create(exec_ctx, target, final_args,
GRPC_CLIENT_CHANNEL, NULL);
grpc_channel_args_destroy(final_args);
grpc_resolver *resolver = grpc_resolver_create(target, &f->base);
if (resolver != NULL) {
grpc_client_channel_set_resolver(
exec_ctx, grpc_channel_get_channel_stack(channel), resolver);
GRPC_RESOLVER_UNREF(exec_ctx, resolver, "create");
} else {
GRPC_CHANNEL_INTERNAL_UNREF(exec_ctx, channel,
"client_channel_factory_create_channel");
channel = NULL;
}
GRPC_SECURITY_CONNECTOR_UNREF(&f->security_connector->base,
"client_channel_factory_create_channel");
return channel;
}
static const grpc_client_channel_factory_vtable client_channel_factory_vtable =
{client_channel_factory_ref, client_channel_factory_unref,
client_channel_factory_create_subchannel,
client_channel_factory_create_channel};
/* Create a secure client channel: /* Create a secure client channel:
Asynchronously: - resolve target Asynchronously: - resolve target
@ -248,13 +280,11 @@ grpc_channel *grpc_secure_channel_create(grpc_channel_credentials *creds,
const char *target, const char *target,
const grpc_channel_args *args, const grpc_channel_args *args,
void *reserved) { void *reserved) {
grpc_channel *channel;
grpc_arg connector_arg; grpc_arg connector_arg;
grpc_channel_args *args_copy; grpc_channel_args *args_copy;
grpc_channel_args *new_args_from_connector; grpc_channel_args *new_args_from_connector;
grpc_channel_security_connector *security_connector; grpc_channel_security_connector *security_connector;
grpc_resolver *resolver; client_channel_factory *f;
subchannel_factory *f;
grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT;
GRPC_API_TRACE( GRPC_API_TRACE(
@ -284,35 +314,30 @@ grpc_channel *grpc_secure_channel_create(grpc_channel_credentials *creds,
new_args_from_connector != NULL ? new_args_from_connector : args, new_args_from_connector != NULL ? new_args_from_connector : args,
&connector_arg, 1); &connector_arg, 1);
channel = grpc_channel_create(&exec_ctx, target, args_copy,
GRPC_CLIENT_CHANNEL, NULL);
f = gpr_malloc(sizeof(*f)); f = gpr_malloc(sizeof(*f));
f->base.vtable = &subchannel_factory_vtable; memset(f, 0, sizeof(*f));
f->base.vtable = &client_channel_factory_vtable;
gpr_ref_init(&f->refs, 1); gpr_ref_init(&f->refs, 1);
GRPC_SECURITY_CONNECTOR_REF(&security_connector->base, "subchannel_factory");
f->security_connector = security_connector;
f->merge_args = grpc_channel_args_copy(args_copy); f->merge_args = grpc_channel_args_copy(args_copy);
f->master = channel;
GRPC_CHANNEL_INTERNAL_REF(channel, "subchannel_factory");
resolver = grpc_resolver_create(target, &f->base);
if (resolver) {
grpc_client_channel_set_resolver(
&exec_ctx, grpc_channel_get_channel_stack(channel), resolver);
GRPC_RESOLVER_UNREF(&exec_ctx, resolver, "create");
}
grpc_subchannel_factory_unref(&exec_ctx, &f->base);
GRPC_SECURITY_CONNECTOR_UNREF(&security_connector->base, "channel_create");
grpc_channel_args_destroy(args_copy); grpc_channel_args_destroy(args_copy);
if (new_args_from_connector != NULL) { if (new_args_from_connector != NULL) {
grpc_channel_args_destroy(new_args_from_connector); grpc_channel_args_destroy(new_args_from_connector);
} }
if (!resolver) { GRPC_SECURITY_CONNECTOR_REF(&security_connector->base,
GRPC_CHANNEL_INTERNAL_UNREF(&exec_ctx, channel, "subchannel_factory"); "grpc_secure_channel_create");
channel = NULL; f->security_connector = security_connector;
grpc_channel *channel = client_channel_factory_create_channel(
&exec_ctx, &f->base, target, GRPC_CLIENT_CHANNEL_TYPE_REGULAR, NULL);
if (channel != NULL) {
f->master = channel;
GRPC_CHANNEL_INTERNAL_REF(f->master, "grpc_secure_channel_create");
} }
grpc_client_channel_factory_unref(&exec_ctx, &f->base);
grpc_exec_ctx_finish(&exec_ctx); grpc_exec_ctx_finish(&exec_ctx);
return channel; return channel; /* may be NULL */
} }

@ -34,7 +34,6 @@
#ifndef GRPC_CORE_LIB_SURFACE_CHANNEL_H #ifndef GRPC_CORE_LIB_SURFACE_CHANNEL_H
#define GRPC_CORE_LIB_SURFACE_CHANNEL_H #define GRPC_CORE_LIB_SURFACE_CHANNEL_H
#include "src/core/ext/client_config/subchannel_factory.h"
#include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/channel/channel_stack.h"
#include "src/core/lib/surface/channel_stack_type.h" #include "src/core/lib/surface/channel_stack_type.h"

@ -85,6 +85,7 @@ CORE_SOURCE_FILES = [
'src/core/ext/census/tracing.c', 'src/core/ext/census/tracing.c',
'src/core/ext/client_config/channel_connectivity.c', 'src/core/ext/client_config/channel_connectivity.c',
'src/core/ext/client_config/client_channel.c', 'src/core/ext/client_config/client_channel.c',
'src/core/ext/client_config/client_channel_factory.c',
'src/core/ext/client_config/client_config.c', 'src/core/ext/client_config/client_config.c',
'src/core/ext/client_config/connector.c', 'src/core/ext/client_config/connector.c',
'src/core/ext/client_config/default_initial_connect_string.c', 'src/core/ext/client_config/default_initial_connect_string.c',
@ -96,7 +97,6 @@ CORE_SOURCE_FILES = [
'src/core/ext/client_config/resolver_factory.c', 'src/core/ext/client_config/resolver_factory.c',
'src/core/ext/client_config/resolver_registry.c', 'src/core/ext/client_config/resolver_registry.c',
'src/core/ext/client_config/subchannel.c', 'src/core/ext/client_config/subchannel.c',
'src/core/ext/client_config/subchannel_factory.c',
'src/core/ext/client_config/subchannel_index.c', 'src/core/ext/client_config/subchannel_index.c',
'src/core/ext/client_config/uri_parser.c', 'src/core/ext/client_config/uri_parser.c',
'src/core/ext/lb_policy/grpclb/load_balancer_api.c', 'src/core/ext/lb_policy/grpclb/load_balancer_api.c',

@ -41,20 +41,28 @@
#include "src/core/lib/iomgr/timer.h" #include "src/core/lib/iomgr/timer.h"
#include "test/core/util/test_config.h" #include "test/core/util/test_config.h"
static void subchannel_factory_ref(grpc_subchannel_factory *scv) {} static void client_channel_factory_ref(grpc_client_channel_factory *scv) {}
static void subchannel_factory_unref(grpc_exec_ctx *exec_ctx, static void client_channel_factory_unref(grpc_exec_ctx *exec_ctx,
grpc_subchannel_factory *scv) {} grpc_client_channel_factory *scv) {}
static grpc_subchannel *subchannel_factory_create_subchannel( static grpc_subchannel *client_channel_factory_create_subchannel(
grpc_exec_ctx *exec_ctx, grpc_subchannel_factory *factory, grpc_exec_ctx *exec_ctx, grpc_client_channel_factory *factory,
grpc_subchannel_args *args) { grpc_subchannel_args *args) {
return NULL; return NULL;
} }
static const grpc_subchannel_factory_vtable sc_vtable = { static grpc_channel *client_channel_factory_create_channel(
subchannel_factory_ref, subchannel_factory_unref, grpc_exec_ctx *exec_ctx, grpc_client_channel_factory *cc_factory,
subchannel_factory_create_subchannel}; const char *target, grpc_client_channel_type type,
grpc_channel_args *args) {
GPR_UNREACHABLE_CODE(return NULL);
}
static const grpc_client_channel_factory_vtable sc_vtable = {
client_channel_factory_ref, client_channel_factory_unref,
client_channel_factory_create_subchannel,
client_channel_factory_create_channel};
static grpc_subchannel_factory sc_factory = {&sc_vtable}; static grpc_client_channel_factory cc_factory = {&sc_vtable};
static gpr_mu g_mu; static gpr_mu g_mu;
static bool g_fail_resolution = true; static bool g_fail_resolution = true;
@ -84,7 +92,7 @@ static grpc_resolver *create_resolver(const char *name) {
grpc_resolver_args args; grpc_resolver_args args;
memset(&args, 0, sizeof(args)); memset(&args, 0, sizeof(args));
args.uri = uri; args.uri = uri;
args.subchannel_factory = &sc_factory; args.client_channel_factory = &cc_factory;
grpc_resolver *resolver = grpc_resolver *resolver =
grpc_resolver_factory_create_resolver(factory, &args); grpc_resolver_factory_create_resolver(factory, &args);
grpc_resolver_factory_unref(factory); grpc_resolver_factory_unref(factory);

@ -38,20 +38,28 @@
#include "src/core/ext/client_config/resolver_registry.h" #include "src/core/ext/client_config/resolver_registry.h"
#include "test/core/util/test_config.h" #include "test/core/util/test_config.h"
static void subchannel_factory_ref(grpc_subchannel_factory *scv) {} static void client_channel_factory_ref(grpc_client_channel_factory *scv) {}
static void subchannel_factory_unref(grpc_exec_ctx *exec_ctx, static void client_channel_factory_unref(grpc_exec_ctx *exec_ctx,
grpc_subchannel_factory *scv) {} grpc_client_channel_factory *scv) {}
static grpc_subchannel *subchannel_factory_create_subchannel( static grpc_subchannel *client_channel_factory_create_subchannel(
grpc_exec_ctx *exec_ctx, grpc_subchannel_factory *factory, grpc_exec_ctx *exec_ctx, grpc_client_channel_factory *factory,
grpc_subchannel_args *args) { grpc_subchannel_args *args) {
GPR_UNREACHABLE_CODE(return NULL); GPR_UNREACHABLE_CODE(return NULL);
} }
static const grpc_subchannel_factory_vtable sc_vtable = { static grpc_channel *client_channel_factory_create_channel(
subchannel_factory_ref, subchannel_factory_unref, grpc_exec_ctx *exec_ctx, grpc_client_channel_factory *cc_factory,
subchannel_factory_create_subchannel}; const char *target, grpc_client_channel_type type,
grpc_channel_args *args) {
GPR_UNREACHABLE_CODE(return NULL);
}
static const grpc_client_channel_factory_vtable sc_vtable = {
client_channel_factory_ref, client_channel_factory_unref,
client_channel_factory_create_subchannel,
client_channel_factory_create_channel};
static grpc_subchannel_factory sc_factory = {&sc_vtable}; static grpc_client_channel_factory cc_factory = {&sc_vtable};
static void test_succeeds(grpc_resolver_factory *factory, const char *string) { static void test_succeeds(grpc_resolver_factory *factory, const char *string) {
grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT;
@ -63,7 +71,7 @@ static void test_succeeds(grpc_resolver_factory *factory, const char *string) {
GPR_ASSERT(uri); GPR_ASSERT(uri);
memset(&args, 0, sizeof(args)); memset(&args, 0, sizeof(args));
args.uri = uri; args.uri = uri;
args.subchannel_factory = &sc_factory; args.client_channel_factory = &cc_factory;
resolver = grpc_resolver_factory_create_resolver(factory, &args); resolver = grpc_resolver_factory_create_resolver(factory, &args);
GPR_ASSERT(resolver != NULL); GPR_ASSERT(resolver != NULL);
GRPC_RESOLVER_UNREF(&exec_ctx, resolver, "test_succeeds"); GRPC_RESOLVER_UNREF(&exec_ctx, resolver, "test_succeeds");

@ -38,20 +38,28 @@
#include "src/core/ext/client_config/resolver_registry.h" #include "src/core/ext/client_config/resolver_registry.h"
#include "test/core/util/test_config.h" #include "test/core/util/test_config.h"
static void subchannel_factory_ref(grpc_subchannel_factory *scv) {} static void client_channel_factory_ref(grpc_client_channel_factory *scv) {}
static void subchannel_factory_unref(grpc_exec_ctx *exec_ctx, static void client_channel_factory_unref(grpc_exec_ctx *exec_ctx,
grpc_subchannel_factory *scv) {} grpc_client_channel_factory *scv) {}
static grpc_subchannel *subchannel_factory_create_subchannel( static grpc_subchannel *client_channel_factory_create_subchannel(
grpc_exec_ctx *exec_ctx, grpc_subchannel_factory *factory, grpc_exec_ctx *exec_ctx, grpc_client_channel_factory *factory,
grpc_subchannel_args *args) { grpc_subchannel_args *args) {
GPR_UNREACHABLE_CODE(return NULL); GPR_UNREACHABLE_CODE(return NULL);
} }
static const grpc_subchannel_factory_vtable sc_vtable = { static grpc_channel *client_channel_factory_create_channel(
subchannel_factory_ref, subchannel_factory_unref, grpc_exec_ctx *exec_ctx, grpc_client_channel_factory *cc_factory,
subchannel_factory_create_subchannel}; const char *target, grpc_client_channel_type type,
grpc_channel_args *args) {
GPR_UNREACHABLE_CODE(return NULL);
}
static const grpc_client_channel_factory_vtable sc_vtable = {
client_channel_factory_ref, client_channel_factory_unref,
client_channel_factory_create_subchannel,
client_channel_factory_create_channel};
static grpc_subchannel_factory sc_factory = {&sc_vtable}; static grpc_client_channel_factory cc_factory = {&sc_vtable};
static void test_succeeds(grpc_resolver_factory *factory, const char *string) { static void test_succeeds(grpc_resolver_factory *factory, const char *string) {
grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT;
@ -63,7 +71,7 @@ static void test_succeeds(grpc_resolver_factory *factory, const char *string) {
GPR_ASSERT(uri); GPR_ASSERT(uri);
memset(&args, 0, sizeof(args)); memset(&args, 0, sizeof(args));
args.uri = uri; args.uri = uri;
args.subchannel_factory = &sc_factory; args.client_channel_factory = &cc_factory;
resolver = grpc_resolver_factory_create_resolver(factory, &args); resolver = grpc_resolver_factory_create_resolver(factory, &args);
GPR_ASSERT(resolver != NULL); GPR_ASSERT(resolver != NULL);
GRPC_RESOLVER_UNREF(&exec_ctx, resolver, "test_succeeds"); GRPC_RESOLVER_UNREF(&exec_ctx, resolver, "test_succeeds");

@ -780,6 +780,7 @@ src/core/ext/census/grpc_filter.h \
src/core/ext/census/mlog.h \ src/core/ext/census/mlog.h \
src/core/ext/census/rpc_metric_id.h \ src/core/ext/census/rpc_metric_id.h \
src/core/ext/client_config/client_channel.h \ src/core/ext/client_config/client_channel.h \
src/core/ext/client_config/client_channel_factory.h \
src/core/ext/client_config/client_config.h \ src/core/ext/client_config/client_config.h \
src/core/ext/client_config/connector.h \ src/core/ext/client_config/connector.h \
src/core/ext/client_config/initial_connect_string.h \ src/core/ext/client_config/initial_connect_string.h \
@ -790,7 +791,6 @@ src/core/ext/client_config/resolver.h \
src/core/ext/client_config/resolver_factory.h \ src/core/ext/client_config/resolver_factory.h \
src/core/ext/client_config/resolver_registry.h \ src/core/ext/client_config/resolver_registry.h \
src/core/ext/client_config/subchannel.h \ src/core/ext/client_config/subchannel.h \
src/core/ext/client_config/subchannel_factory.h \
src/core/ext/client_config/subchannel_index.h \ src/core/ext/client_config/subchannel_index.h \
src/core/ext/client_config/uri_parser.h \ src/core/ext/client_config/uri_parser.h \
src/core/ext/lb_policy/grpclb/load_balancer_api.h \ src/core/ext/lb_policy/grpclb/load_balancer_api.h \
@ -919,6 +919,7 @@ src/core/ext/census/placeholders.c \
src/core/ext/census/tracing.c \ src/core/ext/census/tracing.c \
src/core/ext/client_config/channel_connectivity.c \ src/core/ext/client_config/channel_connectivity.c \
src/core/ext/client_config/client_channel.c \ src/core/ext/client_config/client_channel.c \
src/core/ext/client_config/client_channel_factory.c \
src/core/ext/client_config/client_config.c \ src/core/ext/client_config/client_config.c \
src/core/ext/client_config/connector.c \ src/core/ext/client_config/connector.c \
src/core/ext/client_config/default_initial_connect_string.c \ src/core/ext/client_config/default_initial_connect_string.c \
@ -930,7 +931,6 @@ src/core/ext/client_config/resolver.c \
src/core/ext/client_config/resolver_factory.c \ src/core/ext/client_config/resolver_factory.c \
src/core/ext/client_config/resolver_registry.c \ src/core/ext/client_config/resolver_registry.c \
src/core/ext/client_config/subchannel.c \ src/core/ext/client_config/subchannel.c \
src/core/ext/client_config/subchannel_factory.c \
src/core/ext/client_config/subchannel_index.c \ src/core/ext/client_config/subchannel_index.c \
src/core/ext/client_config/uri_parser.c \ src/core/ext/client_config/uri_parser.c \
src/core/ext/lb_policy/grpclb/load_balancer_api.c \ src/core/ext/lb_policy/grpclb/load_balancer_api.c \

@ -4008,6 +4008,7 @@
"src/core/ext/census/mlog.h", "src/core/ext/census/mlog.h",
"src/core/ext/census/rpc_metric_id.h", "src/core/ext/census/rpc_metric_id.h",
"src/core/ext/client_config/client_channel.h", "src/core/ext/client_config/client_channel.h",
"src/core/ext/client_config/client_channel_factory.h",
"src/core/ext/client_config/client_config.h", "src/core/ext/client_config/client_config.h",
"src/core/ext/client_config/connector.h", "src/core/ext/client_config/connector.h",
"src/core/ext/client_config/initial_connect_string.h", "src/core/ext/client_config/initial_connect_string.h",
@ -4018,7 +4019,6 @@
"src/core/ext/client_config/resolver_factory.h", "src/core/ext/client_config/resolver_factory.h",
"src/core/ext/client_config/resolver_registry.h", "src/core/ext/client_config/resolver_registry.h",
"src/core/ext/client_config/subchannel.h", "src/core/ext/client_config/subchannel.h",
"src/core/ext/client_config/subchannel_factory.h",
"src/core/ext/client_config/subchannel_index.h", "src/core/ext/client_config/subchannel_index.h",
"src/core/ext/client_config/uri_parser.h", "src/core/ext/client_config/uri_parser.h",
"src/core/ext/lb_policy/grpclb/load_balancer_api.h", "src/core/ext/lb_policy/grpclb/load_balancer_api.h",
@ -4171,6 +4171,8 @@
"src/core/ext/client_config/channel_connectivity.c", "src/core/ext/client_config/channel_connectivity.c",
"src/core/ext/client_config/client_channel.c", "src/core/ext/client_config/client_channel.c",
"src/core/ext/client_config/client_channel.h", "src/core/ext/client_config/client_channel.h",
"src/core/ext/client_config/client_channel_factory.c",
"src/core/ext/client_config/client_channel_factory.h",
"src/core/ext/client_config/client_config.c", "src/core/ext/client_config/client_config.c",
"src/core/ext/client_config/client_config.h", "src/core/ext/client_config/client_config.h",
"src/core/ext/client_config/connector.c", "src/core/ext/client_config/connector.c",
@ -4192,8 +4194,6 @@
"src/core/ext/client_config/resolver_registry.h", "src/core/ext/client_config/resolver_registry.h",
"src/core/ext/client_config/subchannel.c", "src/core/ext/client_config/subchannel.c",
"src/core/ext/client_config/subchannel.h", "src/core/ext/client_config/subchannel.h",
"src/core/ext/client_config/subchannel_factory.c",
"src/core/ext/client_config/subchannel_factory.h",
"src/core/ext/client_config/subchannel_index.c", "src/core/ext/client_config/subchannel_index.c",
"src/core/ext/client_config/subchannel_index.h", "src/core/ext/client_config/subchannel_index.h",
"src/core/ext/client_config/uri_parser.c", "src/core/ext/client_config/uri_parser.c",
@ -4622,6 +4622,7 @@
"src/core/ext/census/mlog.h", "src/core/ext/census/mlog.h",
"src/core/ext/census/rpc_metric_id.h", "src/core/ext/census/rpc_metric_id.h",
"src/core/ext/client_config/client_channel.h", "src/core/ext/client_config/client_channel.h",
"src/core/ext/client_config/client_channel_factory.h",
"src/core/ext/client_config/client_config.h", "src/core/ext/client_config/client_config.h",
"src/core/ext/client_config/connector.h", "src/core/ext/client_config/connector.h",
"src/core/ext/client_config/initial_connect_string.h", "src/core/ext/client_config/initial_connect_string.h",
@ -4632,7 +4633,6 @@
"src/core/ext/client_config/resolver_factory.h", "src/core/ext/client_config/resolver_factory.h",
"src/core/ext/client_config/resolver_registry.h", "src/core/ext/client_config/resolver_registry.h",
"src/core/ext/client_config/subchannel.h", "src/core/ext/client_config/subchannel.h",
"src/core/ext/client_config/subchannel_factory.h",
"src/core/ext/client_config/subchannel_index.h", "src/core/ext/client_config/subchannel_index.h",
"src/core/ext/client_config/uri_parser.h", "src/core/ext/client_config/uri_parser.h",
"src/core/ext/lb_policy/grpclb/load_balancer_api.h", "src/core/ext/lb_policy/grpclb/load_balancer_api.h",
@ -4770,6 +4770,8 @@
"src/core/ext/client_config/channel_connectivity.c", "src/core/ext/client_config/channel_connectivity.c",
"src/core/ext/client_config/client_channel.c", "src/core/ext/client_config/client_channel.c",
"src/core/ext/client_config/client_channel.h", "src/core/ext/client_config/client_channel.h",
"src/core/ext/client_config/client_channel_factory.c",
"src/core/ext/client_config/client_channel_factory.h",
"src/core/ext/client_config/client_config.c", "src/core/ext/client_config/client_config.c",
"src/core/ext/client_config/client_config.h", "src/core/ext/client_config/client_config.h",
"src/core/ext/client_config/connector.c", "src/core/ext/client_config/connector.c",
@ -4791,8 +4793,6 @@
"src/core/ext/client_config/resolver_registry.h", "src/core/ext/client_config/resolver_registry.h",
"src/core/ext/client_config/subchannel.c", "src/core/ext/client_config/subchannel.c",
"src/core/ext/client_config/subchannel.h", "src/core/ext/client_config/subchannel.h",
"src/core/ext/client_config/subchannel_factory.c",
"src/core/ext/client_config/subchannel_factory.h",
"src/core/ext/client_config/subchannel_index.c", "src/core/ext/client_config/subchannel_index.c",
"src/core/ext/client_config/subchannel_index.h", "src/core/ext/client_config/subchannel_index.h",
"src/core/ext/client_config/uri_parser.c", "src/core/ext/client_config/uri_parser.c",

@ -289,6 +289,7 @@
<ClInclude Include="$(SolutionDir)\..\src\core\ext\census\mlog.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\ext\census\mlog.h" />
<ClInclude Include="$(SolutionDir)\..\src\core\ext\census\rpc_metric_id.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\ext\census\rpc_metric_id.h" />
<ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\client_channel.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\client_channel.h" />
<ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\client_channel_factory.h" />
<ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\client_config.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\client_config.h" />
<ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\connector.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\connector.h" />
<ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\initial_connect_string.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\initial_connect_string.h" />
@ -299,7 +300,6 @@
<ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\resolver_factory.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\resolver_factory.h" />
<ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\resolver_registry.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\resolver_registry.h" />
<ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\subchannel.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\subchannel.h" />
<ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\subchannel_factory.h" />
<ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\subchannel_index.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\subchannel_index.h" />
<ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\uri_parser.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\uri_parser.h" />
<ClInclude Include="$(SolutionDir)\..\src\core\ext\lb_policy\grpclb\load_balancer_api.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\ext\lb_policy\grpclb\load_balancer_api.h" />
@ -441,6 +441,8 @@
</ClCompile> </ClCompile>
<ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\client_channel.c"> <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\client_channel.c">
</ClCompile> </ClCompile>
<ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\client_channel_factory.c">
</ClCompile>
<ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\client_config.c"> <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\client_config.c">
</ClCompile> </ClCompile>
<ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\connector.c"> <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\connector.c">
@ -463,8 +465,6 @@
</ClCompile> </ClCompile>
<ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\subchannel.c"> <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\subchannel.c">
</ClCompile> </ClCompile>
<ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\subchannel_factory.c">
</ClCompile>
<ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\subchannel_index.c"> <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\subchannel_index.c">
</ClCompile> </ClCompile>
<ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\uri_parser.c"> <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\uri_parser.c">

@ -34,6 +34,9 @@
<ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\client_channel.c"> <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\client_channel.c">
<Filter>src\core\ext\client_config</Filter> <Filter>src\core\ext\client_config</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\client_channel_factory.c">
<Filter>src\core\ext\client_config</Filter>
</ClCompile>
<ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\client_config.c"> <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\client_config.c">
<Filter>src\core\ext\client_config</Filter> <Filter>src\core\ext\client_config</Filter>
</ClCompile> </ClCompile>
@ -67,9 +70,6 @@
<ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\subchannel.c"> <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\subchannel.c">
<Filter>src\core\ext\client_config</Filter> <Filter>src\core\ext\client_config</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\subchannel_factory.c">
<Filter>src\core\ext\client_config</Filter>
</ClCompile>
<ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\subchannel_index.c"> <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\subchannel_index.c">
<Filter>src\core\ext\client_config</Filter> <Filter>src\core\ext\client_config</Filter>
</ClCompile> </ClCompile>
@ -551,6 +551,9 @@
<ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\client_channel.h"> <ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\client_channel.h">
<Filter>src\core\ext\client_config</Filter> <Filter>src\core\ext\client_config</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\client_channel_factory.h">
<Filter>src\core\ext\client_config</Filter>
</ClInclude>
<ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\client_config.h"> <ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\client_config.h">
<Filter>src\core\ext\client_config</Filter> <Filter>src\core\ext\client_config</Filter>
</ClInclude> </ClInclude>
@ -581,9 +584,6 @@
<ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\subchannel.h"> <ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\subchannel.h">
<Filter>src\core\ext\client_config</Filter> <Filter>src\core\ext\client_config</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\subchannel_factory.h">
<Filter>src\core\ext\client_config</Filter>
</ClInclude>
<ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\subchannel_index.h"> <ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\subchannel_index.h">
<Filter>src\core\ext\client_config</Filter> <Filter>src\core\ext\client_config</Filter>
</ClInclude> </ClInclude>

@ -279,6 +279,7 @@
<ClInclude Include="$(SolutionDir)\..\src\core\ext\census\mlog.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\ext\census\mlog.h" />
<ClInclude Include="$(SolutionDir)\..\src\core\ext\census\rpc_metric_id.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\ext\census\rpc_metric_id.h" />
<ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\client_channel.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\client_channel.h" />
<ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\client_channel_factory.h" />
<ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\client_config.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\client_config.h" />
<ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\connector.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\connector.h" />
<ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\initial_connect_string.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\initial_connect_string.h" />
@ -289,7 +290,6 @@
<ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\resolver_factory.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\resolver_factory.h" />
<ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\resolver_registry.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\resolver_registry.h" />
<ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\subchannel.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\subchannel.h" />
<ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\subchannel_factory.h" />
<ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\subchannel_index.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\subchannel_index.h" />
<ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\uri_parser.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\uri_parser.h" />
<ClInclude Include="$(SolutionDir)\..\src\core\ext\lb_policy\grpclb\load_balancer_api.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\ext\lb_policy\grpclb\load_balancer_api.h" />
@ -417,6 +417,8 @@
</ClCompile> </ClCompile>
<ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\client_channel.c"> <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\client_channel.c">
</ClCompile> </ClCompile>
<ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\client_channel_factory.c">
</ClCompile>
<ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\client_config.c"> <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\client_config.c">
</ClCompile> </ClCompile>
<ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\connector.c"> <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\connector.c">
@ -439,8 +441,6 @@
</ClCompile> </ClCompile>
<ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\subchannel.c"> <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\subchannel.c">
</ClCompile> </ClCompile>
<ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\subchannel_factory.c">
</ClCompile>
<ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\subchannel_index.c"> <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\subchannel_index.c">
</ClCompile> </ClCompile>
<ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\uri_parser.c"> <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\uri_parser.c">

@ -34,6 +34,9 @@
<ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\client_channel.c"> <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\client_channel.c">
<Filter>src\core\ext\client_config</Filter> <Filter>src\core\ext\client_config</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\client_channel_factory.c">
<Filter>src\core\ext\client_config</Filter>
</ClCompile>
<ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\client_config.c"> <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\client_config.c">
<Filter>src\core\ext\client_config</Filter> <Filter>src\core\ext\client_config</Filter>
</ClCompile> </ClCompile>
@ -67,9 +70,6 @@
<ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\subchannel.c"> <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\subchannel.c">
<Filter>src\core\ext\client_config</Filter> <Filter>src\core\ext\client_config</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\subchannel_factory.c">
<Filter>src\core\ext\client_config</Filter>
</ClCompile>
<ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\subchannel_index.c"> <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\subchannel_index.c">
<Filter>src\core\ext\client_config</Filter> <Filter>src\core\ext\client_config</Filter>
</ClCompile> </ClCompile>
@ -488,6 +488,9 @@
<ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\client_channel.h"> <ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\client_channel.h">
<Filter>src\core\ext\client_config</Filter> <Filter>src\core\ext\client_config</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\client_channel_factory.h">
<Filter>src\core\ext\client_config</Filter>
</ClInclude>
<ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\client_config.h"> <ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\client_config.h">
<Filter>src\core\ext\client_config</Filter> <Filter>src\core\ext\client_config</Filter>
</ClInclude> </ClInclude>
@ -518,9 +521,6 @@
<ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\subchannel.h"> <ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\subchannel.h">
<Filter>src\core\ext\client_config</Filter> <Filter>src\core\ext\client_config</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\subchannel_factory.h">
<Filter>src\core\ext\client_config</Filter>
</ClInclude>
<ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\subchannel_index.h"> <ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\subchannel_index.h">
<Filter>src\core\ext\client_config</Filter> <Filter>src\core\ext\client_config</Filter>
</ClInclude> </ClInclude>

Loading…
Cancel
Save