Renamed subchannel_factory to client_channel_factory.

Added the ability to create channels from client_channel_factory. This
will be used by the grpclb code to create the channels to communicate
with the LB servers.

BUILD

@@ -195,6 +195,7 @@ cc_library(
  "src/core/lib/channel/http_client_filter.h",
  "src/core/lib/channel/http_server_filter.h",
  "src/core/lib/channel/subchannel_call_holder.h",
+ "src/core/lib/client_config/client_channel_factory.h",
  "src/core/lib/client_config/client_config.h",
  "src/core/lib/client_config/connector.h",
  "src/core/lib/client_config/initial_connect_string.h",
@@ -210,7 +211,6 @@ cc_library(
  "src/core/lib/client_config/resolvers/dns_resolver.h",
  "src/core/lib/client_config/resolvers/sockaddr_resolver.h",
  "src/core/lib/client_config/subchannel.h",
- "src/core/lib/client_config/subchannel_factory.h",
  "src/core/lib/client_config/subchannel_index.h",
  "src/core/lib/client_config/uri_parser.h",
  "src/core/lib/compression/algorithm_metadata.h",
@@ -339,6 +339,7 @@ cc_library(
  "src/core/lib/channel/http_client_filter.c",
  "src/core/lib/channel/http_server_filter.c",
  "src/core/lib/channel/subchannel_call_holder.c",
+ "src/core/lib/client_config/client_channel_factory.c",
  "src/core/lib/client_config/client_config.c",
  "src/core/lib/client_config/connector.c",
  "src/core/lib/client_config/default_initial_connect_string.c",
@@ -355,7 +356,6 @@ cc_library(
  "src/core/lib/client_config/resolvers/dns_resolver.c",
  "src/core/lib/client_config/resolvers/sockaddr_resolver.c",
  "src/core/lib/client_config/subchannel.c",
- "src/core/lib/client_config/subchannel_factory.c",
  "src/core/lib/client_config/subchannel_index.c",
  "src/core/lib/client_config/uri_parser.c",
  "src/core/lib/compression/compression_algorithm.c",
@@ -566,6 +566,7 @@ cc_library(
  "src/core/lib/channel/http_client_filter.h",
  "src/core/lib/channel/http_server_filter.h",
  "src/core/lib/channel/subchannel_call_holder.h",
+ "src/core/lib/client_config/client_channel_factory.h",
  "src/core/lib/client_config/client_config.h",
  "src/core/lib/client_config/connector.h",
  "src/core/lib/client_config/initial_connect_string.h",
@@ -581,7 +582,6 @@ cc_library(
  "src/core/lib/client_config/resolvers/dns_resolver.h",
  "src/core/lib/client_config/resolvers/sockaddr_resolver.h",
  "src/core/lib/client_config/subchannel.h",
- "src/core/lib/client_config/subchannel_factory.h",
  "src/core/lib/client_config/subchannel_index.h",
  "src/core/lib/client_config/uri_parser.h",
  "src/core/lib/compression/algorithm_metadata.h",
@@ -694,6 +694,7 @@ cc_library(
  "src/core/lib/channel/http_client_filter.c",
  "src/core/lib/channel/http_server_filter.c",
  "src/core/lib/channel/subchannel_call_holder.c",
+ "src/core/lib/client_config/client_channel_factory.c",
  "src/core/lib/client_config/client_config.c",
  "src/core/lib/client_config/connector.c",
  "src/core/lib/client_config/default_initial_connect_string.c",
@@ -710,7 +711,6 @@ cc_library(
  "src/core/lib/client_config/resolvers/dns_resolver.c",
  "src/core/lib/client_config/resolvers/sockaddr_resolver.c",
  "src/core/lib/client_config/subchannel.c",
- "src/core/lib/client_config/subchannel_factory.c",
  "src/core/lib/client_config/subchannel_index.c",
  "src/core/lib/client_config/uri_parser.c",
  "src/core/lib/compression/compression_algorithm.c",
@@ -1404,6 +1404,7 @@ objc_library(
  "src/core/lib/channel/http_client_filter.c",
  "src/core/lib/channel/http_server_filter.c",
  "src/core/lib/channel/subchannel_call_holder.c",
+ "src/core/lib/client_config/client_channel_factory.c",
  "src/core/lib/client_config/client_config.c",
  "src/core/lib/client_config/connector.c",
  "src/core/lib/client_config/default_initial_connect_string.c",
@@ -1420,7 +1421,6 @@ objc_library(
  "src/core/lib/client_config/resolvers/dns_resolver.c",
  "src/core/lib/client_config/resolvers/sockaddr_resolver.c",
  "src/core/lib/client_config/subchannel.c",
- "src/core/lib/client_config/subchannel_factory.c",
  "src/core/lib/client_config/subchannel_index.c",
  "src/core/lib/client_config/uri_parser.c",
  "src/core/lib/compression/compression_algorithm.c",
@@ -1573,6 +1573,7 @@ objc_library(
  "src/core/lib/channel/http_client_filter.h",
  "src/core/lib/channel/http_server_filter.h",
  "src/core/lib/channel/subchannel_call_holder.h",
+ "src/core/lib/client_config/client_channel_factory.h",
  "src/core/lib/client_config/client_config.h",
  "src/core/lib/client_config/connector.h",
  "src/core/lib/client_config/initial_connect_string.h",
@@ -1588,7 +1589,6 @@ objc_library(
  "src/core/lib/client_config/resolvers/dns_resolver.h",
  "src/core/lib/client_config/resolvers/sockaddr_resolver.h",
  "src/core/lib/client_config/subchannel.h",
- "src/core/lib/client_config/subchannel_factory.h",
  "src/core/lib/client_config/subchannel_index.h",
  "src/core/lib/client_config/uri_parser.h",
  "src/core/lib/compression/algorithm_metadata.h",

Makefile

@@ -2477,6 +2477,7 @@ LIBGRPC_SRC = \
  src/core/lib/channel/http_client_filter.c \
  src/core/lib/channel/http_server_filter.c \
  src/core/lib/channel/subchannel_call_holder.c \
+ src/core/lib/client_config/client_channel_factory.c \
  src/core/lib/client_config/client_config.c \
  src/core/lib/client_config/connector.c \
  src/core/lib/client_config/default_initial_connect_string.c \
@@ -2493,7 +2494,6 @@ LIBGRPC_SRC = \
  src/core/lib/client_config/resolvers/dns_resolver.c \
  src/core/lib/client_config/resolvers/sockaddr_resolver.c \
  src/core/lib/client_config/subchannel.c \
- src/core/lib/client_config/subchannel_factory.c \
  src/core/lib/client_config/subchannel_index.c \
  src/core/lib/client_config/uri_parser.c \
  src/core/lib/compression/compression_algorithm.c \
@@ -2836,6 +2836,7 @@ LIBGRPC_UNSECURE_SRC = \
  src/core/lib/channel/http_client_filter.c \
  src/core/lib/channel/http_server_filter.c \
  src/core/lib/channel/subchannel_call_holder.c \
+ src/core/lib/client_config/client_channel_factory.c \
  src/core/lib/client_config/client_config.c \
  src/core/lib/client_config/connector.c \
  src/core/lib/client_config/default_initial_connect_string.c \
@@ -2852,7 +2853,6 @@ LIBGRPC_UNSECURE_SRC = \
  src/core/lib/client_config/resolvers/dns_resolver.c \
  src/core/lib/client_config/resolvers/sockaddr_resolver.c \
  src/core/lib/client_config/subchannel.c \
- src/core/lib/client_config/subchannel_factory.c \
  src/core/lib/client_config/subchannel_index.c \
  src/core/lib/client_config/uri_parser.c \
  src/core/lib/compression/compression_algorithm.c \

binding.gyp

@@ -601,6 +601,7 @@
  'src/core/lib/channel/http_client_filter.c',
  'src/core/lib/channel/http_server_filter.c',
  'src/core/lib/channel/subchannel_call_holder.c',
+ 'src/core/lib/client_config/client_channel_factory.c',
  'src/core/lib/client_config/client_config.c',
  'src/core/lib/client_config/connector.c',
  'src/core/lib/client_config/default_initial_connect_string.c',
@@ -617,7 +618,6 @@
  'src/core/lib/client_config/resolvers/dns_resolver.c',
  'src/core/lib/client_config/resolvers/sockaddr_resolver.c',
  'src/core/lib/client_config/subchannel.c',
- 'src/core/lib/client_config/subchannel_factory.c',
  'src/core/lib/client_config/subchannel_index.c',
  'src/core/lib/client_config/uri_parser.c',
  'src/core/lib/compression/compression_algorithm.c',

build.yaml

@@ -259,6 +259,7 @@ filegroups:
  - src/core/lib/channel/http_client_filter.h
  - src/core/lib/channel/http_server_filter.h
  - src/core/lib/channel/subchannel_call_holder.h
+ - src/core/lib/client_config/client_channel_factory.h
  - src/core/lib/client_config/client_config.h
  - src/core/lib/client_config/connector.h
  - src/core/lib/client_config/initial_connect_string.h
@@ -274,7 +275,6 @@ filegroups:
  - src/core/lib/client_config/resolvers/dns_resolver.h
  - src/core/lib/client_config/resolvers/sockaddr_resolver.h
  - src/core/lib/client_config/subchannel.h
- - src/core/lib/client_config/subchannel_factory.h
  - src/core/lib/client_config/subchannel_index.h
  - src/core/lib/client_config/uri_parser.h
  - src/core/lib/compression/algorithm_metadata.h
@@ -359,6 +359,7 @@ filegroups:
  - src/core/lib/channel/http_client_filter.c
  - src/core/lib/channel/http_server_filter.c
  - src/core/lib/channel/subchannel_call_holder.c
+ - src/core/lib/client_config/client_channel_factory.c
  - src/core/lib/client_config/client_config.c
  - src/core/lib/client_config/connector.c
  - src/core/lib/client_config/default_initial_connect_string.c
@@ -375,7 +376,6 @@ filegroups:
  - src/core/lib/client_config/resolvers/dns_resolver.c
  - src/core/lib/client_config/resolvers/sockaddr_resolver.c
  - src/core/lib/client_config/subchannel.c
- - src/core/lib/client_config/subchannel_factory.c
  - src/core/lib/client_config/subchannel_index.c
  - src/core/lib/client_config/uri_parser.c
  - src/core/lib/compression/compression_algorithm.c

config.m4

@@ -123,6 +123,7 @@ if test "$PHP_GRPC" != "no"; then
  src/core/lib/channel/http_client_filter.c \
  src/core/lib/channel/http_server_filter.c \
  src/core/lib/channel/subchannel_call_holder.c \
+ src/core/lib/client_config/client_channel_factory.c \
  src/core/lib/client_config/client_config.c \
  src/core/lib/client_config/connector.c \
  src/core/lib/client_config/default_initial_connect_string.c \
@@ -139,7 +140,6 @@ if test "$PHP_GRPC" != "no"; then
  src/core/lib/client_config/resolvers/dns_resolver.c \
  src/core/lib/client_config/resolvers/sockaddr_resolver.c \
  src/core/lib/client_config/subchannel.c \
- src/core/lib/client_config/subchannel_factory.c \
  src/core/lib/client_config/subchannel_index.c \
  src/core/lib/client_config/uri_parser.c \
  src/core/lib/compression/compression_algorithm.c \

gRPC.podspec

@@ -197,6 +197,7 @@ Pod::Spec.new do |s|
  'src/core/lib/channel/http_client_filter.h',
  'src/core/lib/channel/http_server_filter.h',
  'src/core/lib/channel/subchannel_call_holder.h',
+ 'src/core/lib/client_config/client_channel_factory.h',
  'src/core/lib/client_config/client_config.h',
  'src/core/lib/client_config/connector.h',
  'src/core/lib/client_config/initial_connect_string.h',
@@ -212,7 +213,6 @@ Pod::Spec.new do |s|
  'src/core/lib/client_config/resolvers/dns_resolver.h',
  'src/core/lib/client_config/resolvers/sockaddr_resolver.h',
  'src/core/lib/client_config/subchannel.h',
- 'src/core/lib/client_config/subchannel_factory.h',
  'src/core/lib/client_config/subchannel_index.h',
  'src/core/lib/client_config/uri_parser.h',
  'src/core/lib/compression/algorithm_metadata.h',
@@ -358,6 +358,7 @@ Pod::Spec.new do |s|
  'src/core/lib/channel/http_client_filter.c',
  'src/core/lib/channel/http_server_filter.c',
  'src/core/lib/channel/subchannel_call_holder.c',
+ 'src/core/lib/client_config/client_channel_factory.c',
  'src/core/lib/client_config/client_config.c',
  'src/core/lib/client_config/connector.c',
  'src/core/lib/client_config/default_initial_connect_string.c',
@@ -374,7 +375,6 @@ Pod::Spec.new do |s|
  'src/core/lib/client_config/resolvers/dns_resolver.c',
  'src/core/lib/client_config/resolvers/sockaddr_resolver.c',
  'src/core/lib/client_config/subchannel.c',
- 'src/core/lib/client_config/subchannel_factory.c',
  'src/core/lib/client_config/subchannel_index.c',
  'src/core/lib/client_config/uri_parser.c',
  'src/core/lib/compression/compression_algorithm.c',
@@ -528,6 +528,7 @@ Pod::Spec.new do |s|
  'src/core/lib/channel/http_client_filter.h',
  'src/core/lib/channel/http_server_filter.h',
  'src/core/lib/channel/subchannel_call_holder.h',
+ 'src/core/lib/client_config/client_channel_factory.h',
  'src/core/lib/client_config/client_config.h',
  'src/core/lib/client_config/connector.h',
  'src/core/lib/client_config/initial_connect_string.h',
@@ -543,7 +544,6 @@ Pod::Spec.new do |s|
  'src/core/lib/client_config/resolvers/dns_resolver.h',
  'src/core/lib/client_config/resolvers/sockaddr_resolver.h',
  'src/core/lib/client_config/subchannel.h',
- 'src/core/lib/client_config/subchannel_factory.h',
  'src/core/lib/client_config/subchannel_index.h',
  'src/core/lib/client_config/uri_parser.h',
  'src/core/lib/compression/algorithm_metadata.h',

grpc.gemspec

@@ -193,6 +193,7 @@ Gem::Specification.new do |s|
  s.files += %w( src/core/lib/channel/http_client_filter.h )
  s.files += %w( src/core/lib/channel/http_server_filter.h )
  s.files += %w( src/core/lib/channel/subchannel_call_holder.h )
+ s.files += %w( src/core/lib/client_config/client_channel_factory.h )
  s.files += %w( src/core/lib/client_config/client_config.h )
  s.files += %w( src/core/lib/client_config/connector.h )
  s.files += %w( src/core/lib/client_config/initial_connect_string.h )
@@ -208,7 +209,6 @@ Gem::Specification.new do |s|
  s.files += %w( src/core/lib/client_config/resolvers/dns_resolver.h )
  s.files += %w( src/core/lib/client_config/resolvers/sockaddr_resolver.h )
  s.files += %w( src/core/lib/client_config/subchannel.h )
- s.files += %w( src/core/lib/client_config/subchannel_factory.h )
  s.files += %w( src/core/lib/client_config/subchannel_index.h )
  s.files += %w( src/core/lib/client_config/uri_parser.h )
  s.files += %w( src/core/lib/compression/algorithm_metadata.h )
@@ -341,6 +341,7 @@ Gem::Specification.new do |s|
  s.files += %w( src/core/lib/channel/http_client_filter.c )
  s.files += %w( src/core/lib/channel/http_server_filter.c )
  s.files += %w( src/core/lib/channel/subchannel_call_holder.c )
+ s.files += %w( src/core/lib/client_config/client_channel_factory.c )
  s.files += %w( src/core/lib/client_config/client_config.c )
  s.files += %w( src/core/lib/client_config/connector.c )
  s.files += %w( src/core/lib/client_config/default_initial_connect_string.c )
@@ -357,7 +358,6 @@ Gem::Specification.new do |s|
  s.files += %w( src/core/lib/client_config/resolvers/dns_resolver.c )
  s.files += %w( src/core/lib/client_config/resolvers/sockaddr_resolver.c )
  s.files += %w( src/core/lib/client_config/subchannel.c )
- s.files += %w( src/core/lib/client_config/subchannel_factory.c )
  s.files += %w( src/core/lib/client_config/subchannel_index.c )
  s.files += %w( src/core/lib/client_config/uri_parser.c )
  s.files += %w( src/core/lib/compression/compression_algorithm.c )

package.json

@@ -136,6 +136,7 @@
  "src/core/lib/channel/http_client_filter.h",
  "src/core/lib/channel/http_server_filter.h",
  "src/core/lib/channel/subchannel_call_holder.h",
+ "src/core/lib/client_config/client_channel_factory.h",
  "src/core/lib/client_config/client_config.h",
  "src/core/lib/client_config/connector.h",
  "src/core/lib/client_config/initial_connect_string.h",
@@ -151,7 +152,6 @@
  "src/core/lib/client_config/resolvers/dns_resolver.h",
  "src/core/lib/client_config/resolvers/sockaddr_resolver.h",
  "src/core/lib/client_config/subchannel.h",
- "src/core/lib/client_config/subchannel_factory.h",
  "src/core/lib/client_config/subchannel_index.h",
  "src/core/lib/client_config/uri_parser.h",
  "src/core/lib/compression/algorithm_metadata.h",
@@ -284,6 +284,7 @@
  "src/core/lib/channel/http_client_filter.c",
  "src/core/lib/channel/http_server_filter.c",
  "src/core/lib/channel/subchannel_call_holder.c",
+ "src/core/lib/client_config/client_channel_factory.c",
  "src/core/lib/client_config/client_config.c",
  "src/core/lib/client_config/connector.c",
  "src/core/lib/client_config/default_initial_connect_string.c",
@@ -300,7 +301,6 @@
  "src/core/lib/client_config/resolvers/dns_resolver.c",
  "src/core/lib/client_config/resolvers/sockaddr_resolver.c",
  "src/core/lib/client_config/subchannel.c",
- "src/core/lib/client_config/subchannel_factory.c",
  "src/core/lib/client_config/subchannel_index.c",
  "src/core/lib/client_config/uri_parser.c",
  "src/core/lib/compression/compression_algorithm.c",

package.xml

@@ -197,6 +197,7 @@
  <file baseinstalldir="/" name="src/core/lib/channel/http_client_filter.h" role="src" />
  <file baseinstalldir="/" name="src/core/lib/channel/http_server_filter.h" role="src" />
  <file baseinstalldir="/" name="src/core/lib/channel/subchannel_call_holder.h" role="src" />
+ <file baseinstalldir="/" name="src/core/lib/client_config/client_channel_factory.h" role="src" />
  <file baseinstalldir="/" name="src/core/lib/client_config/client_config.h" role="src" />
  <file baseinstalldir="/" name="src/core/lib/client_config/connector.h" role="src" />
  <file baseinstalldir="/" name="src/core/lib/client_config/initial_connect_string.h" role="src" />
@@ -212,7 +213,6 @@
  <file baseinstalldir="/" name="src/core/lib/client_config/resolvers/dns_resolver.h" role="src" />
  <file baseinstalldir="/" name="src/core/lib/client_config/resolvers/sockaddr_resolver.h" role="src" />
  <file baseinstalldir="/" name="src/core/lib/client_config/subchannel.h" role="src" />
- <file baseinstalldir="/" name="src/core/lib/client_config/subchannel_factory.h" role="src" />
  <file baseinstalldir="/" name="src/core/lib/client_config/subchannel_index.h" role="src" />
  <file baseinstalldir="/" name="src/core/lib/client_config/uri_parser.h" role="src" />
  <file baseinstalldir="/" name="src/core/lib/compression/algorithm_metadata.h" role="src" />
@@ -345,6 +345,7 @@
  <file baseinstalldir="/" name="src/core/lib/channel/http_client_filter.c" role="src" />
  <file baseinstalldir="/" name="src/core/lib/channel/http_server_filter.c" role="src" />
  <file baseinstalldir="/" name="src/core/lib/channel/subchannel_call_holder.c" role="src" />
+ <file baseinstalldir="/" name="src/core/lib/client_config/client_channel_factory.c" role="src" />
  <file baseinstalldir="/" name="src/core/lib/client_config/client_config.c" role="src" />
  <file baseinstalldir="/" name="src/core/lib/client_config/connector.c" role="src" />
  <file baseinstalldir="/" name="src/core/lib/client_config/default_initial_connect_string.c" role="src" />
@@ -361,7 +362,6 @@
  <file baseinstalldir="/" name="src/core/lib/client_config/resolvers/dns_resolver.c" role="src" />
  <file baseinstalldir="/" name="src/core/lib/client_config/resolvers/sockaddr_resolver.c" role="src" />
  <file baseinstalldir="/" name="src/core/lib/client_config/subchannel.c" role="src" />
- <file baseinstalldir="/" name="src/core/lib/client_config/subchannel_factory.c" role="src" />
  <file baseinstalldir="/" name="src/core/lib/client_config/subchannel_index.c" role="src" />
  <file baseinstalldir="/" name="src/core/lib/client_config/uri_parser.c" role="src" />
  <file baseinstalldir="/" name="src/core/lib/compression/compression_algorithm.c" role="src" />